base & layout & js
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/FrontOffice/OptimusBundle/Resources/views/layout.html.twig