Add model, migration, and admin for categories
Merge branch 'master' into categories
add categories