refs #9799 resolving conflicts with master

Merge branch 'master' into feature/9799_SphinxDocs

Conflicts:
	Code/Mantid/docs/source/algorithms/GroupDetectors-v2.rst
	Code/Mantid/docs/source/algorithms/LoadDetectorInfo-v1.rst
	Code/Mantid/docs/source/algorithms/OneStepMDEW-v1.rst
	Code/Mantid/docs/source/algorithms/SofQW2-v1.rst
	Code/Mantid/docs/source/algorithms/SofQW3-v1.rst
refs #9799 fixing merge conflicts with develp

Merge branch 'feature/9799_SphinxDocs' into develop

Conflicts:
	Code/Mantid/docs/source/algorithms/SofQW2-v1.rst
	Code/Mantid/docs/source/algorithms/SofQW3-v1.rst