Merge branch 'pr/141'
Updating tons of javadoc
ignoring generated sources, unpacked libraries, etc
Merge branch 'pr/142'