db migrate
Merge branch 'master' of https://github.com/pathsource/city_data
fix city work
Merge branch 'master' of https://github.com/pathsource/city_data