tp / asset

teleport dans la nouvelle salle
asset objets
Merge branch 'master' of https://github.com/filippixavier/GW-Pilz

Conflicts:
	scripts/MapManager.js
	scripts/assets.json
	scripts/maps.json
	scripts/object.class.js
Merge branch 'master' of https://github.com/filippixavier/GW-Pilz