Initial add-category branch commit
Add category basic complete
Add catagory complete basic
resolveConlf
Merge branches 'Add-Category' and 'master'