Merge branch 'master' into 'master'

Update of Cryo OPIs

See merge request !265

NON-APPROVED/Cryo/Cryo OPIs.bob

@@ -137,16 +137,16 @@
     <y>270</y>
     <width>630</width>
     <height>10</height>
-    <line_color>
-      <color name="BLACK-BORDER" red="121" green="121" blue="121">
-      </color>
-    </line_color>
     <points>
       <point x="630.0" y="0.0">
       </point>
       <point x="0.0" y="0.0">
       </point>
     </points>
+    <line_color>
+      <color name="BLACK-BORDER" red="121" green="121" blue="121">
+      </color>
+    </line_color>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>Action Button_8</name>
@@ -168,7 +168,7 @@
     <name>Action Button_9</name>
     <actions>
       <action type="open_display">
-        <file>../TS2/ts2-cryomodule/TS2_main2.bob</file>
+        <file>../TS2/ts2-cryomodule/TS2_main4.bob</file>
         <target>tab</target>
         <description>Open Display</description>
       </action>