DC and maquette
Merge branch 'master' of https://github.com/Nujerk/ProjetENI

Conflicts:
	Julien/Maquette/maquette_session.xml