Merge local branch to remote master
Better description
C&P
testje
Adjusted Gamepage
Game screen adjusted
Merge branch 'tim1'

Conflicts:
	module/Game/view/game/game/index.phtml