Increasing time to allow settling and small altering cleanup
Fix first of two tests dependant on number of database versions
Merge pull request #194 from syncany/bugfix/daemon-test

Increasing time to allow settling and small altering cleanup
Use non-zero exit code on error
Revert "Use non-zero exit code on error"

This reverts commit 2abf2fa59f06f02c8c2be1358c158e2ed6eea851.

Non-zero exit codes break gradle
Merge branch 'develop' of github.com:syncany/syncany into develop
Merge branch 'develop' into feature/daemonauth