Change city_code column name to iata_code
Merge remote-tracking branch 'refs/remotes/origin/master'