calendar v1.2 added: updat,delete events
Merge branch 'master' of https://github.com/claroline/Claroline

Conflicts:
	src/core/Claroline/CoreBundle/Controller/CalendarController.php
Merge branch 'master' of https://github.com/claroline/Claroline
Merge branch 'master' of https://github.com/claroline/Claroline
Merge branch 'master' of https://github.com/claroline/Claroline
calendar stable version
Merge branch 'master' of https://github.com/claroline/Claroline