Added permission notes
Added check for tester
Merge branch 'master' into production