initial commit of new GameStates feature
fix issues with states
Merge branch 'game-states'