Fixing admin rights to see all data
Merge branch 'master' into deploy