Beautifier
Merge remote-tracking branch 'origin/master'

Conflicts:
	game/lib/js/main.js