Merge remote-tracking branch 'origin/master'

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