Merge origin/master

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