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
Correct/add method for using idciExporter with group and user
Correct translation + correct displaying/hidding award form + removing link on badge image
Change title form award form
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
GUI update
Merge branch 'master' of https://github.com/solispauwels/Claroline into GUI
deleted src/plugin/Claroline/AnnouncementBundle
Resource rights form are now usable (gui and redirection still needs rework)
Fixing a bug happening in testFindRoleByWorkspaceAction
Update composer.lock with new version of frontEnBundle for new version of confirm-boostrap (+ other update of vendors)
Update award form with boostrap3
Fixing claro_resource_custom route
Merge remote-tracking branch 'upstream/master' into bugfix
Closes #126