Merge branch 'develop-PlotEquiMap_shapefile_enh' into 'master'

Plot shapefile after plotting the data, so the shapefile is on top of everything

See merge request !78