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
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
Closes #126
Merge remote-tracking branch 'upstream/master' into issue-126-announcements

Conflicts:
	src/core/Claroline/CoreBundle/Resources/translations/platform.en.yml
	src/core/Claroline/CoreBundle/Resources/translations/platform.fr.yml
Debug drag'n drop upload with bootstrap 3
Merge pull request #205 from kitan1982/issue-126-announcements

Issue 126 announcements
Merge pull request #207 from Vaince/master

Debug drag'n drop upload with bootstrap 3
XmlResponse for authentication and registration.
Merge remote-tracking branch 'upstream/master' into bugfix

Conflicts:
	src/core/Claroline/CoreBundle/Resources/public/js/resource/manager.js
	src/core/Claroline/CoreBundle/Resources/views/Resource/multipleRightsPage.html.twig