tinymce + calendar filter
Merge branch 'master' of https://github.com/claroline/Claroline

Conflicts:
	app/config/config.yml
Submodule update
Merge branch 'master' of https://github.com/claroline/Claroline