Squashed 'core/' changes from 5d613bd..f4f6ae9

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
71f0368 Update CHANGELOG.md
4de8018 Update CHANGELOG.md

git-subtree-dir: core
git-subtree-split: f4f6ae98521983ed8e705064cabceb3625aa1e5b
Merge commit '840c3181b7877f33fba3dba432709543e552e548' into develop