Merge branch 'develop' into feature/daemon
Merge branch 'feature/daemon' of github.com:syncany/syncany into feature/daemon
Fix CLIoverREST (add default constructor)
Added new target architecture diagram
Failing test
Resolves issue #147 in regards to conflicting licenses.
Merge pull request #149 from acmiyaguchi/develop

Resolves issue #147 in regards to conflicting licenses.
Fix last license issue
Update CHANGELOG.md
Choosing an appropriate file history to continue in a move
Remove TODO
Merge branch 'develop' of github.com:syncany/syncany into develop
Fixes #142
Merge branch 'bugfix/identical-move' into develop
Breaking up very long method into two long methods
Merge branch 'develop' into feature/daemon
Merge branch 'develop' into feature/daemonauth
Merge branch 'feature/daemon' into feature/daemonauth