Merge pull request #424 from solispauwels/master

Tinymce generated content update + simple rights update
Include other workspaces manager roles in right management
Merge pull request #425 from solispauwels/master

TinyMCE generated content Update + Home Page Bug fix
Merge pull request #426 from stefk/rights-change

Include other workspaces manager roles in right management
Merge pull request #427 from solispauwels/master

rights update for options in directory mode
Merge remote-tracking branch 'upstream/master'