Fill in some java docs
Merge branch 'master' into acl_graph