Updated tinymce bundle
Updated tinymce config
Merge remote-tracking branch 'upstream/master' into tinymce
Merge branch 'tinymce-bundle-upgrade' of https://github.com/stefk/Claroline into tinymce

Conflicts:
	app/config/config.yml
	composer.lock
upgrade tinymce bundle
Merge remote-tracking branch 'upstream/master' into tinymce

Conflicts:
	composer.lock
	src/core/Claroline/CoreBundle/Resources/public/js/tinymce/config.js
	src/plugin/Claroline/ExampleBundle
fixed tests
upgrade submodule
Merge pull request #174 from easy-es/tinymce

close #131