Merge remote-tracking branch 'origin/bugfix/10410_elasticwindow_algo_should_support_sqw'
Merge branch 'master' into feature/9970_refactor_project_serialisation

Refs #9970

Conflicts:
	Code/Mantid/MantidPlot/src/ApplicationWindow.cpp
	Code/Mantid/MantidPlot/src/ApplicationWindow.h
Refs #9970 Save spectrogram's matrix

The matrix a spectrogram was meant to be representing was not being
saved into the project files. This has now been resolved. However, this
is not being saved in previous versions of Mantid (which crash when
dealing with spectrograms apparently).
Refs #9970 Fix saving of 3D graphs
Merge branch 'feature/9970_refactor_project_serialisation' into develop

Conflicts:
	Code/Mantid/MantidPlot/src/ApplicationWindow.h