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
Added missing <th> in message templates
Merge branch 'master' of https://github.com/claroline/Claroline into bug-fixes
Fixed template bug in widget configuration
Closes #50
Closes #46
Closes #45
Refactored route of Cancel button in user parameters
Closes #44