Add logout button
Merge branch 'develop'