premerge
Merge branch 'master' of http://github.com/shawnhanna/HTMLGameMaker

Conflicts:
	Engine/LoadScene.js