Squashed 'core/' changes from c05fabb..8b515b0

8b515b0 Add fileType to local plugin
cb4ed48 Add fileType attribute in  annotation, relates to #297
cc6f6e6 Merge branch 'develop' into feature/issue297-wizard
8621851 Merge branch 'feature/issue297-oauth' into feature/issue297-wizard
46177b7 Cont'd working on OAuth stuff. Works well with Dropbox plugin
b896527 Add  annotation and add to CLI flow
d6fe1d9 Added workaround for 'connect' via GUI with syncany:// link, relates to #297
6c3a8ba A first shot at the WebSocketUserInteractionListener
4074da3 Patch transaction stats bug
b8aa466 Make CipherSpec default constructor (to allow serialization); relates to #297
0820c08 Added skeleton InitManagementRequest/Response, relates to #297
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
8b7050b Make OptionCallback non-static class
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()
fd9e8b1 Update changelog; handle invalid proxy port in Error: No repository found in path, or configured plugin not installed. Use 'sy init' to create one.        Refer to help page using '--help'. #293
f040c0e Fixes issues with 'sy genlink -s' and resolves #293
2cb4bd0 Merge branch 'feature/issue286/daemon-add' into develop
3a62417 A little bit more logging and checking
8dcb1d0 Writing to persistent transaction file on failure of transaction
88b2748 Adding a status to ActionTO
d9aee31 Expose write of RemoteTransaction publicly
2f2377d Update changelog
13efedd Fix 'sy daemon start' on Windows, relates to #286
89f8374 Update batch file
1874d62 Output for other actions
aca573a Add 'sy daemon (list|add|remove)'; works on Linux; Windows to go; relates to #286
01bc595 Update CHANGELOG.md
ddd1546 Merge branch 'develop' of github.com:syncany/syncany into develop
bdbfee8 Merge branch 'feature/workingicon' into develop
f72f197 Add new 'change detected' events
6f0ad3c Bumping PKGBUILD, editing syncany script to include daemon
1d53f32 Add WatchStart/Stop event
23aebbe Move around events
3e54fbf Bump version
ad57b8e Update CHANGELOG.md
14f909a Merge pull request #292 from syncany/hotfix/issue291
823d536 Merge branch 'develop' of https://github.com/syncany/syncany into hotfix/issue291
6359837 Ensure that proxy port is a positive number when creating short urls
95134a5 Update homebrew formula
760d87c Update homebrew formula
51cca24 Fix DB tests
9e84dd0 Merge tag 'v0.3.0-alpha' into develop
2292efa Circumvent exception when parsing proxy port
fa15cb5 Genlink -s command should respect proxy settings

git-subtree-dir: core
git-subtree-split: 8b515b0b78fc42034da76f2230bfe01fe77d0094
Merge commit '4759863f21da4d118234e561a95b20a63a3d9e0a' into feature/issue297-wizard
Add fileType to private key attribute
Remove core
Squashed 'core/' content from commit 53acb09

git-subtree-dir: core
git-subtree-split: 53acb0935a3c77f2e6bc46e59f3f5501eb626e0b
Merge commit '62f6fc392bd17e2a9f1dcc515c133e4400bdda60' as 'core'
Add icon
Bump version
Merge branch 'release/plugin-sftp/v0.4.1-alpha'