Mise en page Créations
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/BAU/MainBundle/Resources/scss/main.scss