Did a bit a cleaning up with the gamestate change event
Merge branch 'feature/GameController' into develop