city updated
Merge branch 'master' of http://github.com/bsknowl/mondial-java

Updated the city method