Update java grammar updates notes.
Merge branch 'server' of github.com:dberg/c4 into server