Merge branch 'next'
Javadoc cleanup
More javadoc updates.
Merge branch 'master' into next
More Javadoc, cleanup and package-info.java-files.
Merge branch 'bmhm/cleanup-v0.1' into next