Merge commit 'c8fa0574dc78dd11729359b018230d742807e33b' into develop
Squashed 'core/' changes from 97159b9..12980f9

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
9f6bcd1 Update CHANGELOG.md
REVERT: 97159b9 Make RAID0 plugin fully functioning. Yeyy
REVERT: 2d9ce0a Merge branch 'develop' into feature/issue192-less-magic
REVERT: e45b6b5 Change generic plugin identifier to ':type' instead of '-type'
REVERT: 6dcb637 Complete JavaDoc for nested options
REVERT: f4f225d Moving classes where they belong(?)
REVERT: 80e0215 JavaDoc-ing and a bit of refactoring
REVERT: d79d5c1 Removing more magic :'-(
REVERT: f664e2c Less magic, remove PluginSettings and PluginManager

git-subtree-dir: core
git-subtree-split: 12980f92763baf28a6076f49f058b3a311789f56
Merge new core
Squashed 'core/' changes from 12980f9..fc95a20

fc95a20 Fix regex to match raid0/s3 plugin

git-subtree-dir: core
git-subtree-split: fc95a2086dd9849aea637d99fff66579079f14f5
Merge commit '483ae03fb9361d62fe0014fde68d5453eab93150' into develop
Squashed 'core/' changes from fc95a20..628f422

628f422 Pre/Post query callback for nested plugin (here: to fix RAID0)

git-subtree-dir: core
git-subtree-split: 628f422c54825cdc7c228d3bb44140dc197a2b98
Merge commit 'c25d5842fccd68897498915d8fdb565c7ed7bbe6' into develop
Remove post query message