Lots of JavaDoc
Merge branch 'develop' of github.com:syncany/syncany into develop