update groupe
fix merge
Ajout des twig de fosUserBundle
Merge branch 'devUserBundleMyk' of https://github.com/christopherlouet/thiefaine into devUserBundle