Changed model_name field to model in category app
All models that use category were ported to use content type
Merged Category changes