Permissions update
added Jason to the header
Merge branch 'master' into hybrid