rien
rien
Merge branch 'master' of https://github.com/facenord-sud/collaide

Conflicts:
	app/views/group/work_groups/new.html.haml