#4 - Authorization privileges fixed
Merge branch 'feature/authorization' into develop
Conflict fix.