Sync'ed logout works
Merge branch 'develop' into gh-pages