modified relations with CityID
Merge branch 'master' of https://github.com/anandsoni11/gothere