Wout: fix
Merge branch 'master' of https://github.com/frostraver/Ip2_Concept2
Wout: Added InputManager Test
Merge branch 'master' of https://github.com/frostraver/Ip2_Concept2

Conflicts:
	XNA_ENGINE/Game/Scenes/GameSceneConcept2.cs