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

# Conflicts:
#	src/Engine/Rendering/RenderState.cpp
#	src/Game/Game.cpp

include/Game/Game.h

@@ -17,6 +17,7 @@
 #include "Core/SystemPipeline.h"
 #include "RaptorCopterSystem.h"
 #include "PlayerSystem.h"
+#include "Editor/EditorSystem.h"
 
 // Network
 #include <boost/thread.hpp>

include/Game/PlayerSystem.h

@@ -19,18 +19,18 @@ struct KeyInput
     bool Right = false;
 };
 
-class PlayerSystem : public System
+class PlayerSystem : public PureSystem
 {
 public:
     PlayerSystem(EventBroker* eventBroker)
-        : System(eventBroker, "Player")
+        : PureSystem(eventBroker, "Player")
     {
         EVENT_SUBSCRIBE_MEMBER(m_EKeyDown, &PlayerSystem::OnKeyDown);
         EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, &PlayerSystem::OnKeyUp);
         EVENT_SUBSCRIBE_MEMBER(m_ECreatePlayer, &PlayerSystem::OnCreatePlayer);
     }
 
-    virtual void Update(World* world, ComponentWrapper& player, double dt) override;
+    virtual void UpdateComponent(World* world, ComponentWrapper& player, double dt) override;
 
 private:
     float m_Speed = 5;

include/Game/RaptorCopterSystem.h

@@ -1,16 +1,14 @@
 #include "Common.h"
 #include "Core/System.h"
 
-class RaptorCopterSystem : public System
+class RaptorCopterSystem : public PureSystem
 {
 public:
     RaptorCopterSystem(EventBroker* eventBroker)
-        : System(eventBroker, "RaptorCopter")
+        : PureSystem(eventBroker, "RaptorCopter")
     { }
 
-	virtual void Initialize() { }
-
-    virtual void Update(World* world, ComponentWrapper& raptorCopter, double dt) override
+    virtual void UpdateComponent(World* world, ComponentWrapper& raptorCopter, double dt) override
     {
         ComponentWrapper& transform = world->GetComponent(raptorCopter.EntityID, "Transform");
         (glm::vec3&)transform["Orientation"] += (float)(double)raptorCopter["Speed"] * (float)dt * (glm::vec3)raptorCopter["Axis"];