Merge branch 'develop' into feature/temporalprofiles

# Conflicts:
#	timeseriesviewer/ui/icons/ActionIdentifyTimeSeries.png
#	timeseriesviewer/ui/icons/CRS.png
#	timeseriesviewer/ui/icons/IconTimeSeries.png
#	timeseriesviewer/ui/icons/copyright_label.png
#	timeseriesviewer/ui/icons/general.png
#	timeseriesviewer/ui/icons/icon.png
#	timeseriesviewer/ui/icons/locked.png
#	timeseriesviewer/ui/icons/lockedGray.png
#	timeseriesviewer/ui/icons/mActionAdd.png
#	timeseriesviewer/ui/icons/mActionAddMapView.png
#	timeseriesviewer/ui/icons/mActionAddRasterLayer.png
#	timeseriesviewer/ui/icons/mActionAddTS.png
#	timeseriesviewer/ui/icons/mActionAtlasFirst.png
#	timeseriesviewer/ui/icons/mActionAtlasLast.png
#	timeseriesviewer/ui/icons/mActionAtlasNext.png
#	timeseriesviewer/ui/icons/mActionAtlasPrev.png
#	timeseriesviewer/ui/icons/mActionEditCopy.png
#	timeseriesviewer/ui/icons/mActionEditPaste.png
#	timeseriesviewer/ui/icons/mActionFileSave.png
#	timeseriesviewer/ui/icons/mActionFileSaveAs.png
#	timeseriesviewer/ui/icons/mActionIdentify.png
#	timeseriesviewer/ui/icons/mActionPan.png
#	timeseriesviewer/ui/icons/mActionRemove.png
#	timeseriesviewer/ui/icons/mActionRemoveMapView.png
#	timeseriesviewer/ui/icons/mActionRemoveTS.png
#	timeseriesviewer/ui/icons/mActionRemoveTSD.png
#	timeseriesviewer/ui/icons/mActionSaveTS.png
#	timeseriesviewer/ui/icons/mActionShowAllLayers.png
#	timeseriesviewer/ui/icons/mActionZoomActual.png
#	timeseriesviewer/ui/icons/mActionZoomFullExtent.png
#	timeseriesviewer/ui/icons/mActionZoomIn.png
#	timeseriesviewer/ui/icons/mActionZoomOut.png
#	timeseriesviewer/ui/icons/mActionZoomPoint.png
#	timeseriesviewer/ui/icons/mActionZoomToArea.png
#	timeseriesviewer/ui/icons/mActionZoomToLayer.png
#	timeseriesviewer/ui/icons/mActionZoomToSelected.png
#	timeseriesviewer/ui/icons/mIconClear.png
#	timeseriesviewer/ui/icons/mIconClearText.png
#	timeseriesviewer/ui/icons/mIconClose.png
#	timeseriesviewer/ui/icons/mIconFieldTime.png
#	timeseriesviewer/ui/icons/mapview.png
#	timeseriesviewer/ui/icons/mapviewHidden.png
#	timeseriesviewer/ui/icons/metadata.png
#	timeseriesviewer/ui/icons/qgis-icon.png
#	timeseriesviewer/ui/icons/render.png
#	timeseriesviewer/ui/icons/settings.png
#	timeseriesviewer/ui/icons/stylepreset.png
#	timeseriesviewer/ui/icons/symbology.png