Added login and logout functionality
Merge origin/master