Merge remote-tracking branch 'origin/master'

Conflicts:
	js/levels/level1.js

Updated platform positions

Platform positions are now normalized