Merge branch 'master' into frameworks

Conflicts:
	src/CMakeLists.txt
	src/backend/worksheet/plots/cartesian/CartesianPlot.cpp
	src/backend/worksheet/plots/cartesian/XYFitCurve.cpp
	src/commonfrontend/worksheet/WorksheetView.cpp
	src/kdefrontend/dockwidgets/XYFourierFilterCurveDock.cpp