End of game fix
Merge branch 'feature/game-end-fix' into develop

Conflicts:
	app/static/project.js