Squashed 'core/' changes from 8b7050b..46177b7

46177b7 Cont'd working on OAuth stuff. Works well with Dropbox plugin
b896527 Add  annotation and add to CLI flow
1586739 Fix tiny bug with 'resume' (encrypted TO file locally); rename local files to .xml
c72d5ed Resume in changelog
a09e7e5 Merge pull request #308 from syncany/feature/resume-transaction
d8c55d6 Merge branch 'develop' into feature/resume-transaction
ac48b8a Checking cache before resuming
9583691 Unencrypt local copies of transaction(-database)
8d7de87 Patch tests to not resume
b3ff42d Update README.md
4755119 Name shutdown hook thread, make 'resume' default in UpOperationOptions
03339d1 Alter --resume to --no-resume (make resume the default)
c71b51e Extracting parts of execute() to other methods
21f145b Merge branch 'feature/resume-transaction' of https://github.com/syncany/syncany into feature/resume-transaction
353ef63 Minor nitpicks
90f6e1d Switching to enums
595f4f7 Major nitpicks
d3a17c2 Resume fails test
58c7467 Merge branch 'develop' into feature/resume-transaction
14ce10d Merge branch 'feature/resume-transaction' of github.com:syncany/syncany into feature/resume-transaction
3b67d1a Merge branch 'develop' into feature/resume-transaction
804bfbb Update CHANGELOG.md
06204f9 Update CHANGELOG.md
ea948c8 Fixes #303
f4ed28f Merge branch 'develop' into bugfix/issue303-delete-moved-files
948cb60 Correct 'sy daemon*' output
f644b02 Documentation
fcd3ff8 Clean resumable transactions if no remote equivalent can be found
c60c96c Use shutdownhooks to enable resume after ctrl+c
38f2ba6 Including --resume in CLI
8287d3d Removing resumable transactions on down/cleanup
cf7ff86 Invert logic in finally-trap
e97f4d0 Deleting files if transaction is successfully resumed and committed
1f7b4f6 Merge branch 'develop' of github.com:syncany/syncany into develop
b41e22b Make OptionCallback/Converter non-static
c9461c2 Reproduce #303
1ff92b7 Update CHANGELOG.md
df8a0d5 Allowing commit to resume transactions
4e5fb3a Enabling resuming, only thing left is to handle it appropriately in commit()
8dcb1d0 Writing to persistent transaction file on failure of transaction
88b2748 Adding a status to ActionTO
d9aee31 Expose write of RemoteTransaction publicly

git-subtree-dir: core
git-subtree-split: 46177b72fa581acbb8877ea6ceed7970e0442605
Merge commit '01e9b09d6e78db76005986d93e2840957876296c' into feature/issue297-oauth
Make OAuth annotation work
Fixing the rest of the open issues for the flickr plugin
Remove core, for readding later
Squashed 'core/' content from commit 53acb09

git-subtree-dir: core
git-subtree-split: 53acb0935a3c77f2e6bc46e59f3f5501eb626e0b
Merge commit '00239bfe64425dccd223b2327a7dab166269032a' as 'core'
Bump version
Merge branch 'release/plugin-flickr/v0.4.1-alpha'