Merge branch 'master' into fix-tm
Reviewing TransferManager.test() code; not done yet; some tests fail
Merge branch 'master' into gui

Conflicts:
	syncany-plugins/syncany-plugin-sftp/src/test/java/org/syncany/tests/connection/plugin/sftp/SftpTransferManagerTest.java