Merge branch 'hotfix/permissions'
Fix
Merge branch 'hotfix/categories' into develop