barre acceuil
merge files

Merge branch 'master' of https://github.com/SalmaF/Symfony2

Conflicts:
	app/Resources/views/base.html.twig
Merge branch 'master' of https://github.com/SalmaF/Symfony2