panier modif
Merge branch 'master' of https://github.com/jococo972/VieilleSardine

Conflicts:
	src/VieilleSardine/UserBundle/Resources/views/Profile/edit_personal_data.html.twig
modif user
Merge origin/master

Conflicts:
	src/VieilleSardine/UserBundle/Resources/views/Profile/edit_personal_data.html.twig