Add logout button.
Merge branch 'master' into demo