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

Conflicts:
	peerbox/src/main/java/org/peerbox/watchservice/FolderWatchService.java
+ Comment H2H-interaction due to null pointer
+ New IllegalStateTransissionException if unexpected state transission
occur
+ As soon as an action is executed, it is set back into InitialState