Create single category model, remove WTFiness
Merge branch 'category_model' into mesg_app