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

OpenRA.Game/Game.cs

@@ -344,9 +344,10 @@ namespace OpenRA
 		{
 			if (orderManager.world != null)
 				orderManager.world.traitDict.PrintReport();
+
+			orderManager.Dispose();
 			CloseServer();
 			JoinLocal();
-			orderManager.Dispose();
 		}
 
 		public static void CloseServer()

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(); }

OpenRA.Game/Network/ReplayConnection.cs

@@ -109,6 +109,7 @@ namespace OpenRA.Network
 				return;
 
 			writer.Close();
+			inner.Dispose();
 			disposed = true;
 		}
 

OpenRA.Game/Widgets/ScrollItemWidget.cs

@@ -9,8 +9,6 @@
 #endregion
 
 using System;
-using System.Drawing;
-using OpenRA.Graphics;
 
 namespace OpenRA.Widgets
 {