Modifs faites en PROD
Merge branch 'master' of https://github.com/Harpaga/harpagaproject

Conflicts:
	src/Harpaga/FrontendBundle/Resources/views/Page/apropos.html.twig
	web/harpaga/frontend/css/frontend-style.css
Modifs en PROD