removed GameState from ui since it belongs to controller
Merge branch 'master' into mainDashboard