Merge pull request #15 from fgenolini/master

Added OpenLayers maps
Added Leaflet maps