Added Mapbox layer
Merge branch 'master' into gh-pages