Reverted commit 036d3d3 to 3bd445e since they dont belong to this branch
Reverted first commit to the initial state
Reverted first commit to the initial state (Fixed spaces to match initial state)
Merge remote-tracking branch 'origin/logout_option'