Updated java docs
Added javadocs and jacoco code coverage
Added new test, and updated test files
IDE changes too
Merge branch 'master' into gh-pages