Merge branch 'develop' of git://github.com/Vocaluxe/Vocaluxe into develop

Conflicts:
	ClientServerLib/ClientServerLib/CServer.cs

Output/Languages/English.xml

@@ -217,4 +217,5 @@
   <string name="TR_SCREENOVIDEOADJUSTMENTS_BOTTOMRIGHT">Bottom right</string>
   <string name="TR_SCREENPVOLUMECONTROL_VOLUME">Volume</string>
   <string name="TR_SCREENPSERVERQR_ADDRESS">Server address</string>
+  <string name="TR_SCREENPSERVERQR_NOTRUNNING">Server is not running. Please check config.xml!</string>
 </resources>

Output/Themes/Ambient/Screens/PopupScreenServerQR.xml

@@ -131,6 +131,36 @@
       <!--   <Space>: Reflection Space-->
       <!--   <Height>: Reflection Height-->
     </TextServerAddress>
+    <TextServerNotRunning>
+      <!--<X>, <Y>: Text position-->
+      <X>640</X>
+      <Y>265</Y>
+      <!--<Z>: Text position-->
+      <Z>-2,00</Z>
+      <!--<H>: Text height-->
+      <H>45</H>
+      <!--<MaxW>: Maximum text width (if exists)-->
+      <MaxW>600</MaxW>
+      <!--<Color>: Text color from ColorScheme (high priority)-->
+      <!--or <R>, <G>, <B>, <A> (lower priority)-->
+      <Color>StaticColor</Color>
+      <!--<SColor>: Selected Text color from ColorScheme (high priority)-->
+      <!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
+      <SColor>TextSColor</SColor>
+      <!--<Align>: Text align horizontal: Left, Center, Right-->
+      <Align>Center</Align>
+      <!--<ResizeAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
+      <HAlign>Center</HAlign>
+      <!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
+      <Style>Bold</Style>
+      <!--<Font>: Text font name-->
+      <Font>Outline</Font>
+      <!--<Text>: Nothing or translation tag-->
+      <Text>TR_SCREENPSERVERQR_NOTRUNNING</Text>
+      <!--<Reflection> If exists:-->
+      <!--   <Space>: Reflection Space-->
+      <!--   <Height>: Reflection Height-->
+    </TextServerNotRunning>
     <Text1>
       <!--<X>, <Y>: Text position-->
       <X>640</X>