Merge
Merge branch 'newmaster' of https://github.com/Herzucco/CraftAndRun into newmaster

Conflicts:
	scripts/game/Level.js
Asset manager example
InputManager
Merge branch 'newmaster' of https://github.com/Herzucco/CraftAndRun into newmaster
Merge branch 'newmaster' of https://github.com/Herzucco/CraftAndRun into newmaster