Data Objects and enums for City and Country.
Merge pull request #176 from sarality/location_data_and_enums

Data Objects and enums for City and Country.