Changing permission types

NOT YET finished.
Minor changes to function names as well
added to last commit
added to last commit 2
Merge remote-tracking branch 'origin/master' into bea
Adding Staff WITH Permissions

WORKING
.gitginore now working
merged