Added game state
Using state manager
Merge branch 'feature/use-states' into develop