Fixed logout path bug
Merge branch 'master' into test