Add categories
Merge branch 'feature/categories' into develop