Merge pull request #73 from blind-squirrel/Sharon

Sharon
Merge branch 'master' into Sharon
completed all security and fixed formatting on edit page. Also have roles showing role names, not numbers
done with security. Moving to another section