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

Conflicts:
	Resources/views/Tool/workspace/agenda/agenda.html.twig
 ergonomy
 check style
Merge pull request #411 from easy-es/ergonomy

Ergonomy