Add user in group OK.
Conflict solved.
picture_controller fix
Merge branch 'master' into arthur/gestion_groupes
Merge pull request #72 from adoulrac/arthur/gestion_groupes

Arthur/gestion groupes