Made essential admin functions.
Merge branch 'admin'