Started Login/Logout functionality
Merge from master