.
实现xmpp添加好友
Merge remote-tracking branch 'origin/master'
.