Merge remote-tracking branch 'origin/Ticket2593_ips' into Release_4.4.1

Author: John-Holt-Tessella

base/uk.ac.stfc.isis.ibex.devicescreens/src/uk/ac/stfc/isis/ibex/devicescreens/components/ComponentType.java

@@ -48,6 +48,8 @@ public enum ComponentType {
     DANFYSIK,
     /** CAEN component type. */
 	CAEN,
+    /** IPS component type. */
+	IPS,
     /** CCD100 component type. */
     CCD100,
     /** Kepco component type. */