finished up session and users
Merge branch 'sessions' into users