add multi controls
Merge branch 'newmaster' of github.com:Herzucco/CraftAndRun into newmaster
Merge remote-tracking branch 'remotes/origin/newmaster' into VDA_Box2DCollision

Conflicts:
	scripts/game/Collider.js
	scripts/game/Ship.js