Merge branch 'master' into feature/thangload

Conflicts:
	app/lib/LevelLoader.coffee
	app/views/play/level_view.coffee