added some user-id asserts
Merge branch 'master' of github.com:collab-mode/collab-mode