working categories
debug
added template folder + back to prod
Merge remote-tracking branch 'origin/master'
removing cruft
Updated models
Updated fixtures
Updated views