modified category and sub_category models
Merge branch 'chamnap'

merge with master