fixed db models
fixed the categories (really did this time)
added test template
Merge branch 'master' of github.com:DexterLB/unifordummies