Merge pull request #136 from jamesyothers/master

highlight selected tab on userView
add logout button to userView