added logout button
Merge branch 'master' into similarity