basic admin function set up
Merge branch 'admin'