Add category model
Merge branch 'develop'