update adminbundle
update adminbundle
update
Merge generationpartage/master

Conflicts:
	app/config/security.yml
	src/Partage/CompetenceBundle/Controller/DemandeController.php
	src/Partage/CompetenceBundle/Resources/views/Default/index.html.twig
	src/Partage/UserBundle/Resources/views/User/fiche.html.twig