RIB
Merge branch 'develop' of https://github.com/nass59/myhoper into develop

Conflicts:
	src/Hoper/ContentBundle/Controller/MenageController.php