added admin functions
Merge branch 'waddo-master'