Merge origin/master

Conflicts:
	game/ui/screens/game_screen.js
Merge origin/master

Conflicts:
	game/ui/screens/game_screen.js