Merge branch

Conflicts:
	index.php
	templates/game.twig
	templates_raw/game.twig