Merge branch 'master' into dev
Mise en page admin
Mise en page formulaire public
Merge branch 'dev' of https://github.com/maxgaillard/genie-en-ligne into maxgaillard-dev

Conflicts:
	admin/js/Admin.js
	admin/vues/AdminVue.class.php

resolution de conflits
Merge branch 'maxgaillard-dev' into dev