MAJ  BO , edit profile
Merge branch 'BO-MAJ' 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/ContentBundle/Controller/ContentController.php
	src/Hoper/UserBundle/Controller/UserController.php
	src/Hoper/UserBundle/Entity/Client.php
	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/Client/edit.html.twig
	src/hoper/AdminBundle/Resources/views/Client/editClient.html.twig
	src/hoper/AdminBundle/Resources/views/Hoper/edit.html.twig
	src/hoper/ContentBundle/Controller/ContentController.php
	src/hoper/UserBundle/Controller/UserController.php
	src/hoper/UserBundle/Entity/Client.php
	src/hoper/UserBundle/Resources/public/css/client.css
	src/hoper/UserBundle/Resources/public/css/profile.css