user model updated
Merge remote-tracking branch 'origin/callback_profile' into callback_profile