nothing
Merge branch 'master' of https://github.com/lijianping/NetworkChat
Merge branch 'master' of https://github.com/lijianping/NetworkChat
添加获取好友地址信息
Merge branch 'master' of https://github.com/lijianping/NetworkChat

Conflicts:
	networkchar/networkchat_client/networkchat_client/chat.cpp
	networkchar/networkchat_client/networkchat_client/main.cpp
	networkchar/networkchat_server/networkchat_server/main.cpp