start storing user_ids on sessions
Merge branch 'user-id-on-sessions'

* user-id-on-sessions:
  start storing user_ids on sessions