Merge pull request #69 from rhokbrisbane/t12121-tag-categories

T12121 tag categories
Merge branch 'master' into db_seeds