add timeout
Merge commit '30943f43c19c81a61e2a4ac00079d97c6666b14b' into develop

Conflicts:
	bitherj/src/main/java/net/bither/bitherj/core/PeerManager.java