Merge pull request #168 from afrjorge/CDF-270

[CDF-270] - CDF refactor is loading all the openstreetmaps crud, resutin...