Resume fails test
Major nitpicks
Switching to enums
Minor nitpicks
Merge branch 'feature/resume-transaction' of https://github.com/syncany/syncany into feature/resume-transaction