Back button changes.
Merge remote-tracking branch 'origin/master'

Conflicts:
	htdocs/pages/game-page.php
Done