fixing authorization bug
Merge branch 'dev' into staging