Added CRUD for categories
Added CRUD for categories
Merged changes