Merge remote-tracking branch 'origin/feature/7397_reflectometry_md_splitting'
Merge remote-tracking branch 'origin/feature/7049_waterfall_resizing'
Merge remote-tracking branch 'origin/feature/7144_new_v_conv_spectrum_axis'

Refs #7144
Conflicts:
	Code/Mantid/Framework/TestHelpers/inc/MantidTestHelpers/WorkspaceCreationHelper.h
Merge remote-tracking branch 'origin/feature/7394_polref_idf'
Merge remote-tracking branch 'origin/feature/7031_deleting_scripts'

Conflicts:
	Code/Mantid/MantidQt/API/inc/MantidQtAPI/ScriptRepositoryView.ui

Refs #7031
Merge remote-tracking branch 'origin/bugfix/7199_vesuvio_fitting_diffs'
Fix merge conflict on ScriptRepositoryView.ui

re #7031
Merge remote-tracking branch 'origin/feature/7325_peaks_on_surface'
Merge remote branch 'origin/feature/7362_enhance_editinstrument'
Re #7402. Remove references to removed property name.
Merge branch 'bugfix/7402_using_removed_property' into develop Re #7402

Conflicts:
	Code/Mantid/Framework/TestHelpers/inc/MantidTestHelpers/WorkspaceCreationHelper.h
	Code/Mantid/MantidQt/API/inc/MantidQtAPI/ScriptRepositoryView.ui