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

Conflicts:
	src/GUI/GameFrame.h
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters

src/Components/TankSteering.h

@@ -7,7 +7,6 @@ namespace Components
 {
 	struct TankSteering : Component
 	{
-		EntityID Player;
 		EntityID Turret;
 		EntityID Barrel;
 		TankSteering* Clone() const override { return new TankSteering(*this); }

src/Components/WheelPair.h

@@ -8,7 +8,8 @@ namespace Components
 
 	struct WheelPair : Component
 	{
-		// Flag for pair wheels
+		EntityID FakeWheelFront;
+		EntityID FakeWheelBack;
 
 		virtual WheelPair* Clone() const override { return new WheelPair(*this); }
 	};