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

New jenerator