merge cnc and ra lobby, fixes #1267, #1224, #106, others

OpenRA.Game/Network/Connection.cs

@@ -202,7 +202,10 @@ namespace OpenRA.Network
 			if (socket != null)
 				socket.Client.Close();
 			using( new PerfSample( "Thread.Join" ))
-				t.Join();
+			{
+				if (!t.Join(1000))
+					return;
+			}
 		}
 
 		~NetworkConnection() { Dispose(); }