fixed bug update
Merge branch 'master' of https://github.com/claroline/CoreBundle

Conflicts:
	Controller/Tool/DesktopAgendaController.php