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

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

src/Game/PlayerSystem.cpp

@@ -1,7 +1,6 @@
 #include "PlayerSystem.h"
 
-
-void PlayerSystem::Update(World * world, ComponentWrapper & player, double dt)
+void PlayerSystem::UpdateComponent(World * world, ComponentWrapper & player, double dt)
 {
     //if (player["Forward"]) {
     //    ((glm::vec3&)player["Velocity"]).z = m_Speed * float(dt) * -1;