Merge origin/master

Conflicts:
	src/Templo/TemploBundle/Resources/views/base.html.twig