Updated java parts and cityville.erl
Merge branch 'master' of github.com:Lelli/cityville