Merge branch 'feature/xtags-review' into feature/editor-tags
Merge branch 'feature/xtags-review' into feature/editor-tags
Added angular xim tags to editor
Merge branch 'feature/editor-tags' into feature/xtags-review