tinymce update
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Resources/translations/platform.en.yml
	Resources/translations/platform.es.yml
	Resources/translations/platform.fr.yml
Merge pull request #547 from solispauwels/master

tinymce update