Mise en place de l'architecture d'objet de quete
Merge branch 'collisions' into merge_tot

Conflicts:
	src/factory/Etage_Factory.cpp