admin boolean to users#edit interface, if masquerading or admin
fix to admin_test.rb
Merge remote-tracking branch 'origin/staging' into targ_rep_combined