merged
Merge branch 'master' of https://github.com/Hive2Hive/PeerBox.git

Conflicts:
	peerbox/src/test/java/org/peerbox/watchservice/integration/FileIntegrationTest.java
Merge branch 'master' of https://github.com/Hive2Hive/PeerBox.git