Merge branch 'develop' into release-3.3.1
Make TinyMCE editors resizable
BBCode: Newlines under attachments are now removed
Further improvement for newlines after attachments
Merge pull request #1216 from cpfeiffer/TinyMCE-resizable

Make TinyMCE editors resizable
Merge pull request #1217 from annando/1411-newlines-beyand-attachments

Suppress newlines beneath attachments
Bump version to 3.3.1. Add CHANGELOG file
Merge branch 'release-3.3.1'
Merge branch 'master' into develop