add more admin functions
add more
Merge remote-tracking branch 'origin/master'