User login and logout fixed
Merge branch 'master' into new_layout