Merge branch 'AC_Camera' of github.com:Herzucco/CraftAndRun into newmaster
modify collider
Merge remote-tracking branch 'remotes/origin/newmaster' into VDA_Box2DCollision

Conflicts:
	scripts/game/Ship.js