Merge remote-tracking branch 'origin/master' into feature/7840_c2e_add_scale_to_res

Conflicts:
	Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ConvertToEnergy.ui

Refs #7840
Merge branch 'feature/7840_c2e_add_scale_to_res' into develop