more features : aggreation for the workspaces
Merge branch 'master' of https://github.com/claroline/Claroline

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