Implement CRUD categories
Merge branch 't7' into develop