Revert "Develop"

Reverts TO2-2014-Kosci/GameControllers#4