f

f
Merge remote-tracking branch 'origin/master'

Conflicts:
	script/restart_game.lua
	xml/page.xml