Merge pull request #22 from gary-pei/master

Implement user logout and update admin logout