Don't pick up guest users when logging in
Add sidebar stuff
Merge branch 'develop'