TinyMCE editor
Begin user group and acl
Merge remote-tracking branch 'origin/master'