Merge branch 'hotfix/1.1'
Bump version
Fix tinyMCE init + remove emoticons + strip_tags comments on update
Merge branch 'hotfix/1.2' into develop