Merge pull request #78 from carlosrusso/master

[CDF-244] Replaced Geolocation service: now using openstreetmaps
[CDF-246] Upgraded OpenLayers to 2.13.1
Merge branch 'master' of github.com:webdetails/cdf