add create delete and edit for categories
fixing merge conflicts
categories
Merge branch 'development-admin-categories'
fixing merge conflicts