Logout button that leads to nothing
Logout actually implemented
Merge branch 'master' of ssh://github/z-hart/Market into collab/z-hart
Merge branch 'collab/z-hart' into dev