Merge branch 'Development' into Gameplay
Merge branch 'Development' of https://github.com/DComm2013Network/CutThePower into Gameplay
Made some changes to help integrate, doing a half-finished commit to merge later.
Merge branch 'Development' of https://github.com/DComm2013Network/CutThePower into Gameplay

Conflicts:
	src/Input/components.h

All conflicts fixed, there the game renders and the player moves
around smoothly.

Fully integrated with Input team.
Merge branch 'Gameplay' into Development