Merge remote-tracking branch 'origin/master'

Conflicts:
	wakkerdam/templates/show_game.html