Merge remote-tracking branch 'origin/master' into chez

Conflicts:
	js/script.js
Merge remote-tracking branch 'origin/master' into chez

Conflicts:
	js/level.js
	js/script.js