Completed basic admin authentication functionality
fixed merge conflicts
fixed merge conflicts from back end
Merge pull request #1 from Mikedgs/admin_auth

Admin auth