Added JavaDocs thru manual merge
Added Generated Java Docs