fix rebase problems and admin factory typo
Merge pull request #6 from DerekMaffett/14_api

fix rebase problems and admin factory typo