d
Merge origin/master

Conflicts:
	composer.lock
Merge origin/master

Conflicts:
	composer.lock
Merge origin/master

Conflicts:
	src/Templo/TemploBundle/Resources/views/includes/menu.html.twig
	src/Templo/UserBundle/Resources/views/dashboard.html.twig