~ fix for network setup (file integration test), excluded delete() operations
Merge branch 'master' of github.com:Hive2Hive/PeerBox

Conflicts:
	peerbox/src/test/java/org/peerbox/watchservice/integration/FileIntegrationTest.java