Merge remote-tracking branch 'origin/feature/5209_default_hidden_categories'
Merge remote-tracking branch 'origin/feature/3095_offsetX_new_Alias'
Merge remote-tracking branch 'origin/feature/6765_Sassena_units'
Refs #6776 Changed conversion factor ps2uev to ps2mev
Refs #6776 Changed conversion factor

Merge branch 'feature/6776_SassenaFFT_milieV' into develop

Conflicts:
	Code/Mantid/Framework/Algorithms/src/SassenaFFT.cpp