:user-type added to session
Merge branch 'master' into user-type-in-session