no message
Merge branch 'master' of https://github.com/AllenShen/ios-p2ptest

Conflicts:
	ios-p2ptest/Classes/p2pnetwork/P2PConnectManager.cpp
no message
Merge branch 'master' of https://github.com/AllenShen/ios-p2ptest

Conflicts:
	ios-p2ptest/Classes/p2pnetwork/P2PConnectManager.cpp
no message
Merge branch 'master' of https://github.com/AllenShen/ios-p2ptest

Conflicts:
	ios-p2ptest.xcodeproj/project.pbxproj
	ios-p2ptest/Classes/p2pnetwork/P2PConnectManager.cpp
no message
Merge branch 'master' of https://github.com/AllenShen/ios-p2ptest

Conflicts:
	ios-p2ptest/Classes/p2pnetwork/P2PConnectManager.cpp
no message
Merge branch 'master' of https://github.com/AllenShen/ios-p2ptest

Conflicts:
	ios-p2ptest/Classes/p2pnetwork/P2PConnectManager.cpp
Merge branch 'master' of https://github.com/AllenShen/ios-p2ptest

Conflicts:
	ios-p2ptest/Classes/p2pnetwork/P2PConnectManager.cpp
no message
Merge branch 'master' of https://github.com/AllenShen/ios-p2ptest

Conflicts:
	ios-p2ptest/Classes/p2pnetwork/P2PConnectManager.cpp
no message
Merge branch 'master' of https://github.com/AllenShen/ios-p2ptest

Conflicts:
	ios-p2ptest/Classes/p2pnetwork/P2PConnectManager.cpp