fixed calendar.js
Merge branch 'master' of https://github.com/claroline/Claroline

Conflicts:
	src/core/Claroline/CoreBundle/Controller/Tool/CalendarController.php
calendar
Merge branch 'master' of https://github.com/claroline/Claroline
calendar fixed bug
Merge remote-tracking branch 'origin/master'