Merge branch 'master' into 'master'

Update for emergency showers.

See merge request ics-software/ess-opis!234

NON-APPROVED/Cryo/Emergency/pressureOverview.bob

@@ -506,11 +506,11 @@
       <x>3</x>
       <y>12</y>
       <off_color>
-        <color name="MAJOR" red="252" green="13" blue="27">
+        <color name="OFF" red="90" green="110" blue="90">
         </color>
       </off_color>
       <on_color>
-        <color name="Off" red="90" green="110" blue="90">
+        <color name="MAJOR" red="252" green="13" blue="27">
         </color>
       </on_color>
     </widget>
@@ -520,11 +520,11 @@
       <x>3</x>
       <y>52</y>
       <off_color>
-        <color name="MAJOR" red="252" green="13" blue="27">
+        <color name="OFF" red="90" green="110" blue="90">
         </color>
       </off_color>
       <on_color>
-        <color name="Off" red="90" green="110" blue="90">
+        <color name="MAJOR" red="252" green="13" blue="27">
         </color>
       </on_color>
     </widget>
@@ -534,11 +534,11 @@
       <x>3</x>
       <y>92</y>
       <off_color>
-        <color name="MAJOR" red="252" green="13" blue="27">
+        <color name="OFF" red="90" green="110" blue="90">
         </color>
       </off_color>
       <on_color>
-        <color name="Off" red="90" green="110" blue="90">
+        <color name="MAJOR" red="252" green="13" blue="27">
         </color>
       </on_color>
     </widget>
@@ -548,11 +548,11 @@
       <x>3</x>
       <y>132</y>
       <off_color>
-        <color name="MAJOR" red="252" green="13" blue="27">
+        <color name="OFF" red="90" green="110" blue="90">
         </color>
       </off_color>
       <on_color>
-        <color name="Off" red="90" green="110" blue="90">
+        <color name="MAJOR" red="252" green="13" blue="27">
         </color>
       </on_color>
     </widget>