Merging develop into feature/atomic-operations

Resolved Conflicts:
	syncany-cli/src/main/java/org/syncany/cli/CleanupCommand.java
	syncany-lib/src/main/java/org/syncany/config/Config.java
	syncany-lib/src/main/java/org/syncany/operations/daemon/WatchRunner.java
	syncany-lib/src/main/java/org/syncany/operations/init/ConnectOperation.java
	syncany-lib/src/main/java/org/syncany/operations/init/InitOperation.java