Merge branch 'hotfix/release-1.2'
Added ICME wysiwyg icon
Merge branch 'hotfix/release-1.3' into develop