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
Added users import into a group + some tests
Merge remote-tracking branch 'upstream/master' into import-users-from-csv-to-group

Conflicts:
	src/core/Claroline/CoreBundle/Entity/Group.php
	src/core/Claroline/CoreBundle/Manager/GroupManager.php
Node entities draft
Merge remote-tracking branch 'upstream/master' into userprofile
Added tests for GroupManager
Added remaining tests for UserManager
Added flashbag for users import
Refactored use order in UserManager
Refactored demo fixture
Install TaxonomyBundle via composer
Merge pull request #138 from claroline/blog_plugin

Blog plugin
Fixed typo
Merge pull request #140 from stefk/log-manager-bug-fix

Fixed typo
Merge branch 'taxonomybundle' of https://github.com/purplefish32/Claroline into
purplefish32-taxonomybundle

Conflicts:
	composer.json
	composer.lock
Merge branch 'master' of https://github.com/claroline/Claroline
close #137
close #137
Merge pull request #141 from easy-es/button-connexion

close #137