GBE-497: Added countries and cities for whole world.
Merge pull request #28 from yflement/IA-289

GBE-497: Added countries and cities for whole world.