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

Conflicts:
	src/Hoper/AdminBundle/Admin/ClientAdmin.php
	src/Hoper/AdminBundle/Admin/HoperAdmin.php
	src/Hoper/AdminBundle/Resources/public/js/admin.js
	src/Hoper/AdminBundle/Resources/views/Default/update_content.html.twig
debug project 2
debug cgu