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

Conflicts:
	ClientServerLib/ClientServerLib/CServer.cs

ClientServerLib/ClientServerLib/CServer.cs

@@ -76,9 +76,9 @@ namespace ServerLib
             _Init(port, encrypted);
         }
 
-        public static string GetLocalAddress()
+        public string GetBaseAddress()
         {
-            return Dns.GetHostName();
+            return _BaseAddress.AbsoluteUri;
 
             /*IPAddress[] ips = Dns.GetHostAddresses(Dns.GetHostName());
             foreach (IPAddress ip in ips)
@@ -89,6 +89,11 @@ namespace ServerLib
             return "";*/
         }
 
+        public bool IsRunning()
+        {
+            return _Host.State == CommunicationState.Opened;
+        }
+
         #region server control
         private void _Init(int port, bool encrypted)
         {