log out bug fixed
Merge branch 'Robert'
login issue