core-6058 core-6059 fix tag remove and editing.
Merge branch 'dev'
Updated gitignore for Idea project directories
Merge branch 'dev' into rewrite