 fix conflicts Merge branch 'feature-user' of github.com:leoliew/easemob-sdk into feature-user
 fix conflicts
Merge branch 'feature-user' of github.com:leoliew/easemob-sdk into feature-user

Conflicts:
	lib/user.js

leoliew/easemob-sdk