Debut du travail sur le B.O.
Changement emplacmement templates
Merge branch 'franck' into admin

Conflicts:
	composer.lock
	core/lib/Thelia/Core/Thelia.php