Merge pull request #89 from ChristianMurphy/develop

Fixed Login and Logout