implemented UI for users to tag
resolve Conflicts
Merge pull request #1086 from nutan-gooru/dev-branch

Implemented UI for users to tag