categorize
removed assets
Merge branch 'feature/categories' into development
Merge branch 'development'