Merge pull request #324 from jerv13/master

Updated admin edit to disable roles=button on edit
Merge remote-tracking branch 'upstream/master'