button that lets admins make other user's admins
fix merge conflicts
Merge branch 'master' into skwak