Merge branch 'master' into client-side
added logged out
Fixing Bugs
Merge branch 'client-side'