Latex and java updates
Merge branch 'master' of github.com:Lelli/cityville