Merge branch 'master' of https://github.com/claroline/CoreBundle
Merge branch 'master' of https://github.com/claroline/CoreBundle
Role create directory option explanation.
Replacing "My account" by "My profile"
Users role not displayed anymore if he cannot edit them.
switching icons for mails & messages in profile.
Mail form ergo.
Redirection to the tool management is there is only 1 tool.
Read messages are now green.
ergo
messages list ergo
Moved user and group management to dedicated controllers
Merge branch 'master' of https://github.com/claroline/CoreBundle
Merge branch 'master' into admin-refact

Conflicts:
	Controller/AdministrationController.php
	Resources/views/Administration/layout.html.twig
ergonomy
Merge branch 'master' of https://github.com/claroline/CoreBundle into ergonomy

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

Ergonomy
Merge pull request #416 from stefk/admin-refact

Admin small enhancements and fixes