Merge remote-tracking branch 'origin/feature/8991_sassenafft_header_remove'
Merge remote branch 'origin/task/8983_rm_workspaceitr'
Merge remote branch 'origin/feature/9106_RemoveLogsWhiteList'
Merge branch 'master' of github.com:mantidproject/mantid into feature/8281_sqw_interface_tidy

Refs #8281

Conflicts:
	Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ConvertToEnergy.ui
Merge branch 'feature/8281_sqw_interface_tidy' into develop

Refs #8281

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