Merge branch 'master' of https://github.com/claroline/CoreBundle
Merge branch 'master' of https://github.com/claroline/CoreBundle
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
Used macro for max results box
Merge pull request #416 from stefk/admin-refact

Admin small enhancements and fixes