pull user info by access_token and openid
merge

Conflicts:
	server/util/oauthUtil.js