Restructuring categories templates
Merge branch 'master' of https://github.com/WIREDTECH/pangea

Merging category template changes
Beat category DOM matched to live