Implement auth screen and Logout
Fix git conflicts from master
Merge branch 'implement-auth-screen'