Merge commit '1.1' into develop
Fixed tinymce.
Merge branch 'release/1.2'