add admin capability to create new admins and delete users
merge in master
merge master
fix bugs
more bug fixes