Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/p2p/TestClient.java
	src/com/p2p/TestServer.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/p2p/TestClient.java
	src/com/p2p/TestServer.java