debugging logout/login
Merge branch 'master' into gh-pages