ergonomy
Merge branch 'master' of https://github.com/claroline/CoreBundle into ergonomy

Conflicts:
	Resources/views/Tool/workspace/roles/workspaceGroups.html.twig
check style typo
Merge pull request #415 from easy-es/ergonomy

Ergonomy