Merge remote-tracking branch 'origin/Networking' into Networking

# Conflicts:
#	src/Engine/Network/Client.cpp

include/Engine/Network/Client.h

@@ -5,10 +5,10 @@
 #include <ctime>
 
 #include <glm/common.hpp>
+#include <boost/asio.hpp>
 
 #include "Network/Network.h"
 #include "Network/MessageType.h"
-#include "Network/NetworkDefinitions.h"
 #include "Network/PlayerDefinition.h"
 #include "Network/SnapshotDefinitions.h"
 #include "Core/World.h"
@@ -21,8 +21,8 @@ class Client : public Network
 public:
     Client(ConfigFile* config);
     ~Client();
-    void Start(World* world, EventBroker* eventBroker);
-    void Update();
+    void Start(World* world, EventBroker* eventBroker) override;
+    void Update() override;
     void Close();
 private:
     // Assio UDP logic