Updated
Merge remote-tracking branch 'origin/master'

Conflicts:
	P2P_FaultTolerance/src/org/umn/distributed/p2p/testfrmwrk/TestClient.java