Refs #7840 added new scale factor option to resolution file.
Merge branch 'feature/7840_c2e_add_scale_to_res' into develop

Refs #7840

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