Cutting out --no-merge-databases
Merge branch 'develop' of https://github.com/syncany/syncany into develop