calendar event  v1.0
Merge branch 'master' of https://github.com/claroline/Claroline

Conflicts:
	src/core/Claroline/CoreBundle/Entity/Workspace/AbstractWorkspace.php