modified login, logout is a dummy
Merge branch 'James'