added userid to session on login
userid added to session on login
Merge origin/master