calendar for desktop + fixed bug for phpcs:²
Merge branch 'master' of https://github.com/claroline/Claroline

Conflicts:
	src/core/Claroline/CoreBundle/Controller/ResourceRightsController.php
	src/core/Claroline/CoreBundle/Resources/config/routing/desktop.yml
	src/core/Claroline/CoreBundle/Resources/views/Desktop/layout.html.twig
Calendar is now a tool (a broken one)