nothing
实现好友聊天窗口关闭移动、ip信息获取、点击好友列表将其窗口移到顶层功能
Merge branch 'master' of https://github.com/lijianping/NetworkChat

Conflicts:
	networkchar/networkchat_client/networkchat_client/my_socket.cpp