Updating syncany/syncany#154; formatting
Squashed 'core/' changes from f3680ec..8970189

8970189 Timer/Thread naming
ddcbd80 Update CHANGELOG.md
735e7be Merge pull request #158 from gtrefs/master
cfbecb2 Issue #156: Added lib path segment to classpath
98f605d Update CHANGELOG.md
439763c Update CHANGELOG.md
629d5d9 Breaking up very long method into two long methods
19f7a5f Merge branch 'bugfix/identical-move' into develop
6317a21 Fixes #142
e40053d Merge branch 'develop' of github.com:syncany/syncany into develop
0c95fd4 Remove TODO
cf90a7a Choosing an appropriate file history to continue in a move
6401b31 Update CHANGELOG.md
11d1f4c Fix last license issue
1f3e67f Merge pull request #149 from acmiyaguchi/develop
1afa06b Resolves issue #147 in regards to conflicting licenses.
3a0ac60 Failing test
d5ad073 Added new target architecture diagram
96dcc2a Removed 'saucy' from Ubuntu releases (unsupported), added 'utopic'.
81cb4e3 Merge branch 'develop' of github.com:syncany/syncany into develop
c9b66ae Lots of JavaDoc
6debe72 Add tip4commit badge
ef80716 Merge branch 'develop' of github.com:syncany/syncany into develop
ad9f5f8 Fix restricted chars in XML issue, fixes #145
706933d Merge pull request #144 from ReAzem/patch-1
f3073f5 Changed badge to SVG
2d1d47d Merge branch 'develop' of https://github.com/syncany/syncany into develop
391e464 Bump PKGBUILD version and fix arch-version variable
8d76061 Update README.md
879759f Bump version
dba78af Merge branch 'release/0.1.6-alpha' into develop
ab2597f Merge branch 'release/0.1.6-alpha'
84b0888 Update readme with version
db09582 Update changelog for release date
d12e710 Enable non-strict daemon config file
22e47e0 Merge branch 'release/0.1.5-alpha'

git-subtree-dir: core
git-subtree-split: 8970189e143a650c332a793ca0b1a624a7a7b2db
Merge commit 'b42e03c69a8ecfef6e99321dc4abfa0e40345c0f' into bugfix/plugin-conflicts
Squashed 'core/' changes from 8970189..7884f98

7884f98 Formatting, renaming to Plugin-Conflicts-With
7444142 Merge branch 'develop' into bugfix/plugin-conflicts
0226500 Lazy plugin loading
724c9c0 Warning for plugin incompatibility

git-subtree-dir: core
git-subtree-split: 7884f98f61c91029ca35c39d965dcd5911e5bdd6
Merge commit 'aabc5ec92e0569d122f9625d84649ba94023f1bb' into bugfix/plugin-conflicts