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

Conflicts:
	src/Components/Physics.h
	src/GameWorld.cpp
	src/World.cpp
	src/World.h
	vs11/Returngeance/Returngeance.vcxproj.filters

src/GameWorld.h

@@ -7,6 +7,7 @@
 #include "Systems/TransformSystem.h"
 //#include "Systems/CollisionSystem.h"
 #include "Systems/InputSystem.h"
+#include "Systems/DebugSystem.h"
 //#include "Systems/LevelGenerationSystem.h"
 #include "Systems/ParticleSystem.h"
 //#include "Systems/PlayerSystem.h"
@@ -30,12 +31,14 @@
 #include "Components/Physics.h"
 #include "Components/Sphere.h"
 #include "Components/Box.h"
+#include "Components/Vehicle.h"
+#include "Components/Wheel.h"
 
 class GameWorld : public World
 {
 public:
-	GameWorld(std::shared_ptr<Renderer> renderer)
-		: m_Renderer(renderer), World() { }
+	GameWorld(std::shared_ptr<::EventBroker> eventBroker, std::shared_ptr<Renderer> renderer)
+		: World(eventBroker), m_Renderer(renderer) { }
 
 	void Initialize();
 
@@ -47,6 +50,9 @@ public:
 
 private:
 	std::shared_ptr<Renderer> m_Renderer;
+
+	void BindKey(int keyCode, std::string command);
+	void BindMouseButton(int button, std::string command);
 };
 
 #endif // GameWorld_h__