remove conflict
Merge branch 'master' into new-jenerator
add java.ml
fix bug
Merge pull request #373 from crossquare/new-jenerator

New jenerator
Fix code style of jenerator
Change the method to specify package name
Add java test
Fix type name of wrappers
Simplify gen_return
Remove redundant capitalize
Refactor java jenerator