Merge remote-tracking branch 'Upstream_opis/master'

# Conflicts:
#	NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob

NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob

@@ -2087,7 +2087,7 @@
         <macros>
           <PLCName>TS2-010CRM:Cryo-PLC-001</PLCName>
         </macros>
-        <target>window</target>
+        <target>standalone</target>
         <description>Open Display</description>
       </action>
     </actions>

NON-APPROVED/TS2/ts2-wtrc/ts2-wtrc.bob

@@ -1221,8 +1221,8 @@
       <WIDDev>PT</WIDDev>
       <WIDDis>WtrC</WIDDis>
       <WIDIndex>501</WIDIndex>
-      <WIDLabel>Pressure</WIDLabel>
-      <WIDSecSub>CWM-CWS05</WIDSecSub>
+      <WIDLabel>Temperature</WIDLabel>
+      <WIDSecSub>TS2-010CRM</WIDSecSub>
     </macros>
     <x>800</x>
     <y>410</y>
@@ -1323,7 +1323,7 @@
     <name>Action Button</name>
     <actions>
       <action type="open_display">
-        <file>../../../../opis/20-SystemExpert/10-ACC/999-TS2/99-WtrC/10-Top/Overview.bob</file>
+        <file>CWM-CWS05/10-Top/Overview.bob</file>
         <target>window</target>
         <description>Open Display</description>
       </action>