Merge apps.tags.models.Tag and apps.tags.models.TagStat (bug 967169)
Merge pull request #1723 from diox/merge-tag-and-tagstat

Merge apps.tags.models.Tag and apps.tags.models.TagStat (bug 967169)