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
Add line number when "\n" is found. fix #380
Write test for parse error
fix #330: disable keeper's internal msgpack::rpc::session timeout.
( require: jubatus-msgpack-rpc 15e8deb )
Merge pull request #386 from unnonouno/feature/fix-parse-error-position

Feature/fix parse error position
fix #376
Merge pull request #387 from luomin/develop

add contribution guideline (fix #376)