BO MAJ (J'ai touché toute le BO)
Merge branch 'BOBranche' into develop

Conflicts:
	src/Hoper/ContentBundle/Form/CodePromoType.php
	src/Hoper/ContentBundle/Resources/views/CodePromo/createcodepromo.html.twig
	src/Hoper/UserBundle/Controller/UserController.php
	src/hoper/ContentBundle/Form/CodePromoType.php
	src/hoper/ContentBundle/Resources/views/CodePromo/createcodepromo.html.twig
	src/hoper/UserBundle/Controller/UserController.php
	src/hoper/UserBundle/Resources/views/Hoper/quizzHoperForm.html.twig