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

Conflicts:
	src/GameWorld.cpp
	src/InputManager.cpp
	src/Systems/RenderSystem.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters

src/Events/BindMouseButton.h

@@ -10,6 +10,7 @@ struct BindMouseButton : Event
 {
 	int Button;
 	std::string Command;
+	float Value;
 };
 
 }

src/Events/LockMouse.h

@@ -0,0 +1,14 @@
+#ifndef Events_LockMouse_h__
+#define Events_LockMouse_h__
+
+#include "EventBroker.h"
+
+namespace Events
+{
+
+struct LockMouse : Event { };
+struct UnlockMouse : Event { };
+
+}
+
+#endif // Events_LockMouse_h__