temp
Merge branch 'refactoring' of https://github.com/Hive2Hive/PeerBox.git
into refactoring

Conflicts:
	peerbox/src/main/java/org/peerbox/watchservice/FileWalker.java
	peerbox/src/main/java/org/peerbox/watchservice/IFileEventManager.java
	peerbox/src/main/java/org/peerbox/watchservice/states/AbstractActionState.java
	peerbox/src/main/java/org/peerbox/watchservice/states/InitialState.java
	peerbox/src/test/java/org/peerbox/watchservice/filetree/DummyFileEventManager.java