stuff for users
Merge branch 'logged_in'