Commit pour pouvoir pull ( je sais pas pourquoi j'ai a commit ca)
Merge branch 'develop' of https://github.com/nass59/hoper into develop

Conflicts:
	src/Hoper/ContentBundle/Resources/views/Menage/menage.html.twig
	src/hoper/ContentBundle/Controller/ContentController.php
	src/hoper/ContentBundle/Resources/public/css/contact.css
	src/hoper/ContentBundle/Resources/public/css/menage.css
	src/hoper/ContentBundle/Resources/views/Content/homepage.html.twig