Merge in Ronen's user model

This merges feature-email into master, handling the routing conflict.