Update README; add java_sample build to test.sh
Merge branch 'crazy'
Fix bad merge