Tinymce generated content update
simple rights update
Merge remote-tracking branch 'upstream/master'
Merge pull request #424 from solispauwels/master

Tinymce generated content update + simple rights update