Merge remote-tracking branch 'origin/master'

Conflicts:
	js/dragAndJump.js
	js/loader.js
	js/platformDragger.js