Client: networking code for client.
Merge branch 'master' of github.com:GRAAFYME/ContainingJ2P2P

Conflicts:
	p2p/client/src/main/java/org/client/Client.java