Merge origin/master

Conflicts:
	src/Alu/AluBundle/Resources/views/layout.html.twig