Merge pull request #984 from oliverds/master

Newsletters HTML editor, Modal confirmation, CDN images
Merge remote-tracking branch 'upstream/master'