add user login and logout
Merge branch 'develop'. user login