Squashed 'core/' changes from f72f197..804bfbb

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
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
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
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
6f0ad3c Bumping PKGBUILD, editing syncany script to include daemon

git-subtree-dir: core
git-subtree-split: 804bfbb94fe5304d4a1f80308ec84656ac70cfee
Merge commit '5cb56cbc7b2da06d74168fadc9febf40c7a32130' into develop
Starting to work on wizard plugin settings dialog, relates to #297
Continued working on wizard. Looks pretty good already.
Add nicer plugin selection screen with plugin logos
Merge commit 'baf84e143a738f4b837233889c2adfc306de1eb6' into feature/issue297-wizard
Squashed 'core/' changes from 804bfbb..c72d5ed

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
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
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: c72d5ed574eb94bfbc25b2b084a826730ab246ba
Squashed 'core/' changes from 804bfbb..1586739

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
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
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: 158673936f6f5adb5c57b7316905521e58e805bc
Merge commit '7e0b151f3f62219f72bbee436805ea2ba49210d4' into develop
Merge commit 'f57e5642a41ae57e79f0c0757483f7efea3c93ae' into feature/issue297-wizard
Squashed 'core/' changes from c72d5ed..1586739

1586739 Fix tiny bug with 'resume' (encrypted TO file locally); rename local files to .xml

git-subtree-dir: core
git-subtree-split: 158673936f6f5adb5c57b7316905521e58e805bc
Merge commit '1fa568d545b15db35262b2d26a600d5bb5f1b029' into feature/issue297-wizard
Squashed 'core/' changes from 1586739..0820c08

0820c08 Added skeleton InitManagementRequest/Response, relates to #297

git-subtree-dir: core
git-subtree-split: 0820c08031154f446e261386859ae19ca1c51f71
Sending InitManagementRequest to daemon
Successfully initializing a repo via wizard, relates to syncany/syncany#297
Working 'init' wizard pages, very ugly though. Needs lots of cleanup
Cont'd working on PluginSettingsPanel validation, relates to syncany/syncany#297
Con'td working on PluginSettingsPanel validation. Works pretty nicely now. Relates to syncany/syncany#297
Make common controller class
Add stack trace to WS errors