remove
Merge branch 'setadmin' into testing