Renamed categories to tags
Merge branch 'dev' into feature/refactor-db-seeds