temp
+ attached FileWatchService (starts after successful login)
Non-empty folder move (many files test does not work yet)
Merge branch 'refactoring' of https://github.com/Hive2Hive/PeerBox.git into refactoring
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
add further checks to integration test: queue and exec. slots must be
empty
Saved state before logging disabled
pre branch switch
+ Events during execution time of action are aggregated, consecutive
actions are taken
+ Locks to prevent problems with concurrent access to actions, and their
states
+ Handled different event-representations of local update (i.e local
update and local delete/create)
+ tests to check for cleaned up queue / execution slots
+ Updated state machine: New State LocalHardDeleteState
+ Updated FileEventManager tests accordingly
Working FileEventManager unit test
Fixes to FileEventManagerTest and AddDeleteTest
pre-fix commit (unit tests don't work in sequence anymore)
Complete AddDelete test with cleanup, sequential execution, etc.
AddDelete/Recover/Move should work (i.e. all tests pass with cleanup)

Update: still some issues (H2H can't delete file for some reason)
Merge remote-tracking branch 'origin/refactoring'

Conflicts:
	peerbox/src/main/java/org/peerbox/presenter/LoginController.java