Merge remote-tracking branch 'upstream/master'
Updated admin edit to disable roles=button
Merge remote-tracking branch 'upstream/master'
Update text-edit buttons to work in firefox
Merge pull request #324 from jerv13/master

Updated admin edit to disable roles=button on edit