Workspace and Desktop are composed of tools: first commit (workspace)
Merge branch 'master' of https://github.com/claroline/Claroline

Conflicts:
	src/core/Claroline/CoreBundle/Resources/config/routing/workspace.yml
workspace and desktop are now composed of tools: second commit (desktop)
cleaning some code