Roles can be created in a workspace.
Merge remote-tracking branch 'upstream/master' into workspace-groups

Conflicts:
	src/core/Claroline/CoreBundle/Controller/Tool/WorkspaceParametersController.php
	src/core/Claroline/CoreBundle/Manager/RightsManager.php
	src/core/Claroline/CoreBundle/Tests/Manager/ResourceManagerTest.php
Refactoring message/users/groups display tables.
Merge remote-tracking branch 'upstream/master' into workspace-groups
Listing for user and groups per role.
Merge remote-tracking branch 'upstream/master' into workspace-groups
Reafactoring permissions for user in a workspace.
Merge remote-tracking branch 'upstream/master' into workspace-groups

Conflicts:
	.gitignore
	src/core/Claroline/CoreBundle/Controller/Tool/UserController.php
	src/core/Claroline/CoreBundle/Manager/UserManager.php
	src/core/Claroline/CoreBundle/Resources/views/Administration/userList.html.twig
	src/core/Claroline/CoreBundle/Resources/views/Administration/usersOfGroupList.html.twig
	src/core/Claroline/CoreBundle/Tests/Manager/ResourceManagerTest.php
	src/core/Claroline/CoreBundle/Tests/Manager/RoleManagerTest.php
	src/core/Claroline/CoreBundle/Tests/Manager/WorkspaceManagerTest.php
Refactoring role management for groups in a workspace.
Adding tests for managers.
Merge remote-tracking branch 'upstream/master' into workspace-groups

Conflicts:
	composer.json
	composer.lock
	src/core/Claroline/CoreBundle/Form/Factory/FormFactory.php
	src/core/Claroline/CoreBundle/Manager/UserManager.php
	src/plugin/Claroline/RssReaderBundle
Tests for RolesController and User|Group Repository.
Merge remote-tracking branch 'upstream/master' into workspace-groups

Conflicts:
	src/core/Claroline/CoreBundle/Controller/Tool/WorkspaceParametersController.php
	src/core/Claroline/CoreBundle/Controller/WorkspaceController.php
	src/core/Claroline/CoreBundle/Converter/MultipleIdsConverter.php
	src/core/Claroline/CoreBundle/Manager/RoleManager.php
	src/core/Claroline/CoreBundle/Tests/Converter/MultipleIdsConverterTest.php
Merge pull request #173 from ngodfraind/workspace-groups

Workspace groups