add session
remove login
Merge branch 'master' into zhili