[Data] Integrated the latest updates from ORI (RFD and Geonames).
Merge branch 'trunk' into trunk_w_weights