cities_light removed, City and Country packages added
Merge remote-tracking branch 'origin/master'