start java api
Merge branch 'master' into java-api
fix source and test paths