Merge remote-tracking branch 'remotes/origin/AC_Camera' into VDA_Box2DCollision
Merge remote-tracking branch 'remotes/origin/lc_spaceship' into VDA_Box2DCollision
Merge remote-tracking branch 'remotes/origin/AC_Camera' into VDA_Box2DCollision
Merge remote-tracking branch 'remotes/origin/lc_spaceship' into VDA_Box2DCollision
Update colission
Merge remote-tracking branch 'remotes/origin/newmaster' into VDA_Box2DCollision

Conflicts:
	scripts/game/Ship.js
add tag and addModules method
Merge remote-tracking branch 'remotes/origin/AC_shipInstanciator' into VDA_Box2DCollision

Conflicts:
	scripts/game/Level.js
	scripts/game/Ship.js
ship is moving
Update Propulsor colission
Merge remote-tracking branch 'remotes/origin/AC_shipInstanciator' into VDA_Box2DCollision

Conflicts:
	scripts/game/Collider.js
	scripts/game/Ship.js
add multi controls
Merge branch 'newmaster' of github.com:Herzucco/CraftAndRun into newmaster
Merge branch 'newmaster' of https://github.com/Herzucco/CraftAndRun into lc_spaceship
editeur fini