edit tags feature
Merge branch 'edit_tag_feature'