Implemented and modified ControlManager class
temp files
Merge branch 'master' of github.com:rbellido/Project

Conflicts:
	redesigned/control/ControlManager.h~
	redesigned/control/ControlState.h~