Cosmetic changes in workspace list in resources parameters
Refactored template rendering with annotations
Submodule update
Merge branch 'master' into refactoring-template-annotation

Conflicts:
	src/core/Claroline/CoreBundle/Controller/DesktopController.php
	src/core/Claroline/CoreBundle/Controller/Tool/HomeController.php
	src/core/Claroline/CoreBundle/Controller/WorkspaceController.php
Merge branch 'master' of https://github.com/claroline/Claroline