Pulling user model or creating it after user logged in
Resolved conflict during merge in evoroom.js