implimenting mapbox
Merge remote-tracking branch 'origin/MAPBOX'