Squashed 'core/' changes from 628f422..831eea7

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

git-subtree-dir: core
git-subtree-split: 831eea7988b409866e4ef269b5802c16855d7e75
Merge commit '2b56ae5149af927091293d7eac2439167c5992c0' into develop