Merge pull request #337 from oliverds/master

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