admin updates
Merge pull request #5 from katerman/dev

admin updates