Planning Hoper
Planning hoper et editer hoper
debug codePromo
pb CodePromo
Merge branch 'develop' of https://github.com/nass59/hoper into develop
Merge Parrainage
Merge branch 'planningHoper' into develop

Conflicts:
	app/Resources/FOSUserBundle/views/Profile/editHoper.html.twig
	src/Hoper/UserBundle/Entity/Hoper.php
	src/hoper/UserBundle/Entity/Hoper.php