Merge pull request #79 from carlosrusso/5-trunk

[CDF-244] Replaced Geolocation service: now using openstreetmaps
Merge branch '5-trunk' of github.com:webdetails/cdf into 5-trunk