Submodule update
Submodule update
Merge remote-tracking branch 'upstream/master' into issue-126-announcements

Conflicts:
	composer.lock
	src/core/Claroline/CoreBundle/Resources/public/js/resource/manager.js
	src/core/Claroline/CoreBundle/Resources/translations/platform.en.yml
	src/core/Claroline/CoreBundle/Resources/translations/platform.fr.yml
	src/core/Claroline/CoreBundle/Resources/views/Activity/index.html.twig
	src/core/Claroline/CoreBundle/Resources/views/Resource/multipleRightsPage.html.twig
	src/core/Claroline/CoreBundle/Resources/views/Tool/workspace/resource_manager/resourcesRights.html.twig
	src/core/Claroline/CoreBundle/Resources/views/Workspace/layout.html.twig
Submodule update
Refactored with bootstrap3. Closes #126
Submodule update
Fixed email bug in users import. Closes #192
Merge remote-tracking branch 'upstream/master' into user-csv-bug-fix
Added explanation for users import
Merge remote-tracking branch 'upstream/master' into user-csv-bug-fix
Closes #190
Fixed users import test
Merge remote-tracking branch 'upstream/master' into user-csv-bug-fix

Conflicts:
	src/core/Claroline/CoreBundle/Resources/translations/platform.en.yml
	src/core/Claroline/CoreBundle/Resources/translations/platform.fr.yml
checkstyle
Merge pull request #203 from kitan1982/user-csv-bug-fix

User csv bug fix
Merge remote-tracking branch 'upstream/master' into issue-126-announcements

Conflicts:
	composer.lock
	src/core/Claroline/CoreBundle/Resources/public/js/resource/manager.js
	src/core/Claroline/CoreBundle/Resources/translations/platform.en.yml
	src/core/Claroline/CoreBundle/Resources/translations/platform.fr.yml
	src/core/Claroline/CoreBundle/Resources/views/Activity/index.html.twig
	src/core/Claroline/CoreBundle/Resources/views/Resource/multipleRightsPage.html.twig
	src/core/Claroline/CoreBundle/Resources/views/Tool/workspace/resource_manager/resourcesRights.html.twig
	src/core/Claroline/CoreBundle/Resources/views/Workspace/layout.html.twig
	src/core/Claroline/CoreBundle/Resources/views/macros.html.twig
	src/plugin/Claroline/AnnouncementBundle
deleted src/plugin/Claroline/AnnouncementBundle
Resource rights form are now usable (gui and redirection still needs rework)
Fixing a bug happening in testFindRoleByWorkspaceAction
Fixing claro_resource_custom route