Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking

# Conflicts:
#	include/Engine/Network/Client.h
#	src/Game/Game.cpp

include/Game/Game.h

@@ -9,10 +9,13 @@
 #include "GUI/Frame.h"
 #include "Core/World.h"
 #include "Rendering/RenderQueueFactory.h"
+
 // Network
 #include <boost/thread.hpp>
+#include "Network/Server.h"
 #include "Network/Client.h"
 
+
 class Game
 {
 public:
@@ -33,8 +36,8 @@ private:
     RenderQueueFactory* m_RenderQueueFactory;
     // Network variables
     boost::thread m_NetworkThread;
+    Server m_Server;
     Client m_Client;
-
     // Network methods
     void NetworkFunction();
 	// Network events