bug userInfo
Merge branch 'dev'