create and get category
Merge branch 'category'