Tools can be renamed (only in the workspace template file for now.
Workspace templates written in a zip file.
Merge.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/plugin/Claroline/SiteBundle
Merge branch 'master' of https://github.com/claroline/Claroline
Merge branch 'master' of https://github.com/claroline/Claroline