Failing test
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