add soem MapBox base maps see MapStory/mapstory/issues/933
add HOT OSM as basemap see MapStory/mapstory/issues/933
Merge branch 'master' of https://github.com/MapStory/mapstory into integration