Need to merge develop changes to Master

Lots of styling changes and integration with MapBox map layer.