new friend Merge branch 'feature-friend' of github.com:leoliew/easemob-sdk into feature-friend
new friend
Merge branch 'feature-friend' of github.com:leoliew/easemob-sdk into feature-friend

Conflicts:
	lib/friend.js

leoliew/easemob-sdk