fix some javadoc errors
Merge branch 'master' of github.com:saxsys/SynchronizeFX
Merge remote-tracking branch 'origin/master' into core-refactoring