Adding JavadocJar task to the build script to zip up the java docs
Merge branch 'dev'