Merge origin/master

Conflicts:
	public_html/files/javascript/game.js