merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	WEB-INF/classes/org/esgi/module/catalogue/CatalogueList.class
	WEB-INF/classes/org/esgi/structure/Accueil.class
Merge branch 'master' of https://github.com/mnomoko/q_EsgiRouter

Conflicts:
	WEB-INF/classes/org/esgi/module/catalogue/CatalogueList.class
	WEB-INF/classes/org/esgi/orm/my/persistence/ORM.class
	WEB-INF/classes/org/esgi/structure/Accueil.class
	WEB-INF/classes/org/esgi/web/FrontController.class