Squashed 'core/' changes from 432cfe8..3fc105e

3fc105e Allow optional 'File' field to be 'null'
a65eb6e Fix exception in toString method
831eea7 Merge branch 'feature/issue192' into develop
9048b46 Last changes before the merge
2adea12 Commenting, remove unused code
6fc0daa Minor: Rename config.xml elements to camelCase
e9d29f7 Use custom action aware encryption converters
9e24e5c Bugfixes and singular field values
7dacfd8 Merge branch 'feature/issue192' of https://github.com/syncany/syncany into feature/issue192
bfcfd92 Decrypt encrypted settings to enable sharing
628f422 Pre/Post query callback for nested plugin (here: to fix RAID0)
fc95a20 Fix regex to match raid0/s3 plugin
12980f9 Fix TS.getField()
98f8f6e Update changelog, many things.
5fdd168 Add --short option to genlink/init to allow the creation of syncany://s/.. short links
7505562 Remove unnecessary dependency
f47588e Add support for shorter syncany://-links
a7abc98 Implemented ApplicationLink class to centralize syncany://-link behavior, relates to #240
93689ae Fix Java 8 compile error, relates to #240
d8505a5 Change share link
b400d95 Disabled dummy tests and fixed bugs regarding to plugin name retrieval
7de2389 Review SimpleXMLification, part 2
d185fde Review SimpleXMLification, part 1
9db7389 Cherry picked javadoc from 6dcb637
7600abc Merge branch 'develop' of https://github.com/syncany/syncany into feature/issue192
9babc5a Re-fix #255 / #254; broken after moving around gradle stuff; making sure it doesn't happen again
8bcb0e7 Update changelog
c4028c6 Merge branch 'develop' of github.com:syncany/syncany into develop
346b495 Harmonize plugin API calls (OS description), fixes #253, fixes #264
6cda36f Bumping PKGBUILD
5e07fc3 Bump version to 0.2.0-alpha; Breaking versions increase minor version now instead of patch version
77e02f5 Fix PluginOperationTest
a0924d5 Merge branch 'develop' into feature/issue192
1143354 Updating 'in-sync' icon after start
6021650 Fix callback bug
187fa1d Add option value to postQueryCallback
c4c5db7 Added postQueryCallback and PluginOptionConverter
eedeabb Use convention over configuration (refers #240)
d294abd Cherry picked RAID0 removal from 0c9ec96
f7ba618 Add targetRemoteFile to TempFile; filename: temp-rand-targetfile
ed6e9b3 Change generic plugin identifier to ':type' instead of '-type'
b33dca1 Cherry picked changed documentation from 80e0215
2709dce Add more detail to status/ls_remote end events
c2ee4c6 Add daemon reloaded event
ad76571 Update setup-cli.iss.skel
f296804 Update SqlRunnerTest.java
6500ac1 Fix NullPointerException during 'sy restore' if file history is invalid.
5bf1197 Repair some unit tests; fix cleanup/database inconsistency issue during cleanup rollback
318b290 Merge branch 'develop' of github.com:syncany/syncany into develop
83e7337 Add targetRemoteFile to TempFile; filename: temp-rand-targetfile
9f6bcd1 Update CHANGELOG.md
5d4a1d4 Moving PluginManager/Settings to .transfer-package. Formatting.
0677425 Merge develop
5b1d4cb Merge branch 'develop' of github.com:syncany/syncany into develop
de4e4a5 React on ControlManagementRequest: Reload daemon
544fb89 Cont'd making DaemonConfigHelper clearer; prepare for service interface
4b53e59 Add new ManagementRequests and move DaemonHelper to lib package
417e5e7 Cont'd review and JavaDoc-ing it a bit; relates to #240 #192
222c8dd Merge branch 'develop' into feature/issue192
126c20a Add RAID0 plugin, and merge develop
f4f6ae9 Update CHANGELOG.md
9077f32 Merge branch 'develop' of github.com:syncany/syncany into develop
8d09794 Allows user and global plugins to coexist, with user-plugin having precendence; relates to #259
8d1665d Merge branch 'develop' of https://github.com/syncany/syncany into feature/issue192
b30a316 Allow the usage of generic and nested transfer plugins
71f0368 Update CHANGELOG.md
4de8018 Update CHANGELOG.md
5d613bd If --log not given, log to user log dir by default, relates to #258
b01560f Add log for GUI command
afc784b Update CHANGELOG.md
d2f672c Merge branch 'bugfix/issue247' into develop
0a5b6fd Merge develop
81dd45c Merge branch 'develop' of https://github.com/syncany/syncany into feature/issue192
f675175 Fix test
1bd43c7 Update changelog
dfd4e86 Filter ignored events
d8fbdcf A bit of JavaDoc-ing
ef20747 Using jpathwatch to monitor Windows file trees without locking directories, works great, relates to #248
85892ad Attempt to resolve issue #248, does not fix this issue though.
6cac3dd Fixes issue #247 and #252; yeyy; Is this too dirty?
ca29cc4 Reproduce issue #247 (cause is #252); yeyy
2be4f37 Fix log message for cleanup
760a4e6 Fix Linux man page handling on 'sy --help'
8bc4f5c For Darwin / Mac OS X: Add -XstartOnFirstThread to JRE options
6c7af17 For Darwin / Mac OS X: Add -XstartOnFirstThread to JRE options
19975f4 add Mac OS X SWT special VM arg
dde514d Bump version
1723829 Release date
3431027 Also upload exe files for plugins
1e2adb2 Add note to travis
e0acf67 Add flags for control build
03a6393 Add dontCopyToUpload flag to pluginJar task
817f4dc Add cleanInstallDir task
fc4841d Fix InnoSetup PATH issues
bc997b8 Remove [Tasks] from windows installer, make clear that this is a CLI-only installer
99abdd1 Update Dockerfile for releases/snapshots to use APT archive
7e46ea6 Remove GPG stuff and obsolete explanations
e0a5a2e Remove PPA stuff in favor of APT archive
d2a9d1b Merge branch 'develop' into feature/issue192
6614dd9 Allow a user to change invalid settings
1d396ba Rename config encryption key
3896242 Fine tuning on interactive and non interactive mode; making isInteractive work; relates to #192
84c323d Make code a bit more readable; no logic changes
cd481be Altered nested options format in non-interactive mode
32a7cd3 Merge branch 'develop' of https://github.com/syncany/syncany into feature/issue192
4242498 Updated scripts related to -I removal
f2a3690 Fixed non-interactive init mode
460b4a4 Fixed conflict due to merge
d7340fe Added javadoc to finalize this issue
461f39e Merge branch 'develop' into feature/issue192
370d1f7 Every feature from syncany/syncany#192 is now implemented
70c153c NestedPluginOption didn't call super() in proper way
79d1646 Support for init of nested transfer settings Reverted @Setup (+sensitive) and @Encryption
4daca37 Remove test 'some' attribute from local plugin
0b9b0b5 Refactoring of Christian's code; no major changes; just renaming, extracting classes, etc.; relates to #192
4aa44aa Merge branch 'develop' into feature/issue192
2fe21de Merge
d606d7a Create a machine dependent private key
59b7859 Trigger generators on field setup
d7a13f6 Removed PluginOptionSpec (see syncany/syncany#192)
66ad993 Merge branch 'develop' of https://github.com/syncany/syncany into feature/issue192
14d6a69 Merge develop
64b4bcc ReflectionUtil: Use getDeclared[Fields|Methods] to find private and protected ones, too
72e8688 Allow plugin devs to define own validators
d8f9d41 Polishing, fixing things; relates to #192
149814b Merge develop
74104f3 Merge branch 'feature/issue192' of https://github.com/cr0/syncany into feature/issue192
6d20b0c Removed deprecated method
04ab30a Merge branch 'develop' of https://github.com/syncany/syncany into feature/issue192
d39ef14 Throw runtime exception when creating transfer* instances Removed java 8 code (finally!) Utility to find a constructor by types Cleanup
158c765 Merge branch 'develop' into feature/issue192
9692170 Merge branch 'develop' of https://github.com/syncany/syncany into feature/issue192
67902dd Removed the last remaining bits of old Map<String,String> settings Fixed NullPointerException (see syncany/syncany#192)
1ca3309 Merge branch 'develop' of https://github.com/syncany/syncany into feature/issue192
674216c Cleanup
c9fbd26 Missed decompress when sharing unecrypted
8504557 Compress connection settings in shared links
1a13b52 Remove whitespaces from shared connections settings
045c384 Use XML format for sharing connections again (see syncany/syncany#192) Deprecated TransferUtil.parseKeyValueMap
9337455 Merge branch 'develop' of https://github.com/syncany/syncany into feature/issue192
6268a27 Fixed some failing tests
eadf9d1 Merge branch 'develop' of https://github.com/syncany/syncany into feature/issue192 Made junit tests compatible again
2673017 Remove some casts
33593d7 Removed Reflections dependency, fixed init procedure (see syncany/syncany#192)
fd49427 Whitespaces
6b69159 Fixed init and share (see syncany/syncany#192)
52745fa Missed to commit TransferSettingsTest
93efdc7 Fixed some reflection stuff in AbstractTransferManager (relates to syncany/syncany#192)
29737cf Fixed test
c01bc92 Messed whitecaps and tabs
b9063b8 Moved createTransferManager to TransferPlugin
3a203b5 Removed createSettings()
c9572f0 Refactored TransferPluginDefinition to PluginSettings
f11afde Some lines were lost in translation
1825564 Persist plugin settings directly (see syncany/syncany#192)
9b3975e Persist plugin settings directly (see syncany/syncany#192)
2c1ad51 Allow a user to define options for transfersettings (see syncany/syncany#192)

git-subtree-dir: core
git-subtree-split: 3fc105eb0b468f5db8791fbd478f1640e8112dd8
Merge commit '043fdd49346ac66f9da1f59072bcdb490550a87f' into develop
Bump version, adjust to new code base