added a conditional build parameter, so that when using java 8 build tools, javadoc is generated without errors, and the build doesn't abort.
Merge branch 'master' into dev