Reproduce issue #247 (cause is #252); yeyy
Fixes issue #247 and #252; yeyy; Is this too dirty?
Merge branch 'bugfix/issue247' into develop
Update CHANGELOG.md
Add log for GUI command
If --log not given, log to user log dir by default, relates to #258
Update CHANGELOG.md
Update CHANGELOG.md
Allows user and global plugins to coexist, with user-plugin having precendence; relates to #259
Merge branch 'develop' of github.com:syncany/syncany into develop
Update CHANGELOG.md
Add new ManagementRequests and move DaemonHelper to lib package
Cont'd making DaemonConfigHelper clearer; prepare for service interface
React on ControlManagementRequest: Reload daemon
Merge branch 'develop' of github.com:syncany/syncany into develop
Update CHANGELOG.md
Add targetRemoteFile to TempFile; filename: temp-rand-targetfile
Merge branch 'develop' of github.com:syncany/syncany into develop
Repair some unit tests; fix cleanup/database inconsistency issue during cleanup rollback
Fix NullPointerException during 'sy restore' if file history is invalid.