Merge "add login and logout function"