Commit BO + getrighthoper
Merge branch 'BOCommit' into BO_-MAJ_III

Conflicts:
	src/Hoper/AdminBundle/Admin/ClientAdmin.php
	src/Hoper/AdminBundle/Admin/HoperAdmin.php
	src/Hoper/AdminBundle/Controller/ClientAdminController.php
	src/Hoper/AdminBundle/Controller/HoperAdminController.php
	src/Hoper/AdminBundle/Resources/views/Default/main-view.html.twig
	src/Hoper/ContentBundle/Controller/ContentController.php
	src/Hoper/ContentBundle/Form/CodePromoType.php
	src/Hoper/ContentBundle/Resources/config/routing.yml
	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
	src/Hoper/ContentBundle/Resources/views/Menage/createMenage.html.twig
	src/Hoper/UserBundle/Controller/UserController.php
	src/Hoper/UserBundle/Entity/HoperRepository.php
	src/Hoper/UserBundle/Resources/config/routing.yml
	src/Hoper/UserBundle/Resources/public/js/form_edit_profile.js
	src/Hoper/UserBundle/Resources/views/Hoper/edit.html.twig
	src/hoper/AdminBundle/Admin/ClientAdmin.php
	src/hoper/AdminBundle/Admin/HoperAdmin.php
	src/hoper/AdminBundle/Controller/ClientAdminController.php
	src/hoper/AdminBundle/Controller/DashboardController.php
	src/hoper/AdminBundle/Controller/HoperAdminController.php
	src/hoper/AdminBundle/Resources/views/Client/edit.html.twig
	src/hoper/AdminBundle/Resources/views/Default/main-view.html.twig
	src/hoper/AdminBundle/Resources/views/Hoper/edit.html.twig
	src/hoper/ContentBundle/Form/CodePromoType.php
	src/hoper/ContentBundle/Resources/config/routing.yml
	src/hoper/ContentBundle/Resources/views/Content/emplois.html.twig
	src/hoper/UserBundle/Controller/UserController.php
	src/hoper/UserBundle/Entity/HoperRepository.php
	src/hoper/UserBundle/Resources/config/routing.yml
	src/hoper/UserBundle/Resources/public/js/form_edit_profile.js
	src/hoper/UserBundle/Resources/views/Hoper/edit.html.twig