Merge remote-tracking branch 'origin/feature/9102_add_summary'
refs #8804 fixed accumulated merge problems with master

Merge branch 'master' into feature/8804_ConverToMDHelperV2
Conflicts:
	Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/UnitsConversionHelper.h
	Code/Mantid/Framework/MDEvents/src/MDTransfModQ.cpp
	Code/Mantid/Framework/MDEvents/src/UnitsConversionHelper.cpp
refs #8804 Fixing errors after merge
refs #8804 fixing conflicts with develop

Merge branch 'feature/8804_ConverToMDHelperV2' into develop

Conflicts:
	.githooks/pre-commit
	Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/UnitsConversionHelper.h
	Code/Mantid/Framework/MDEvents/src/MDTransfModQ.cpp
	Code/Mantid/Framework/MDEvents/src/UnitsConversionHelper.cpp