Overhaul of game state management. Each state has its own controller Screen
Successful merge