Tags and location related changes
Merge pull request #10 from niravpatel2008/developer

Tags and location related changes
Conflict resolved