Merge branch 'dev-PlotCombinedMap_triangle_ends' into 'master'

Dev PlotCombinedMap triangle_ends and individual color bars

See merge request !175
1 job for master
in 36 seconds, using 0 compute credits, and was queued for 2 seconds