Merge remote-tracking branch 'origin/feature/7179_muon_result_table_field_and_temp'
Merge remote-tracking branch 'origin/feature/8791_Plot_improvements'
Merge remote-tracking branch 'origin/master' into feature/8727_icat_external_dl_file_creation. Refs #8757.

Conflicts:
	Code/Mantid/Framework/Algorithms/src/FixGSASInstrumentFile.cpp
	Code/Mantid/Framework/Algorithms/src/ReflectometryWorkflowBase.cpp
	Code/Mantid/Framework/CurveFitting/src/LeBailFit.cpp
	Code/Mantid/Framework/CurveFitting/src/ProcessBackground.cpp
	Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadFullprofResolution.h
	Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadNexusProcessed.h
	Code/Mantid/Framework/DataHandling/src/LoadFullprofResolution.cpp
	Code/Mantid/Framework/DataHandling/src/LoadMuonNexus1.cpp
	Code/Mantid/Framework/DataHandling/src/LoadNexusProcessed.cpp
	Code/Mantid/Framework/DataHandling/src/SaveAscii2.cpp
	Code/Mantid/Framework/DataHandling/src/SaveFullprofResolution.cpp
	Code/Mantid/Framework/DataHandling/test/LoadFullprofResolutionTest.h
	Code/Mantid/Framework/DataHandling/test/LoadISISNexusTest.h
	Code/Mantid/Framework/DataHandling/test/LoadMuonNexus1Test.h
	Code/Mantid/Framework/DataHandling/test/LoadNexusProcessedTest.h
	Code/Mantid/Framework/DataHandling/test/SaveAscii2Test.h
	Code/Mantid/Framework/DataObjects/src/VectorColumn.cpp
	Code/Mantid/Framework/ICat/inc/MantidICat/CatalogAlgorithmHelper.h
	Code/Mantid/Framework/ICat/inc/MantidICat/CatalogPublish.h
	Code/Mantid/Framework/ICat/src/CatalogAlgorithmHelper.cpp
	Code/Mantid/Framework/ICat/src/CatalogDownloadDataFiles.cpp
	Code/Mantid/Framework/ICat/src/CatalogPublish.cpp
	Code/Mantid/Framework/ICat/src/ICat4/ICat4Catalog.cpp
	Code/Mantid/Framework/LiveData/inc/MantidLiveData/ISISLiveEventDataListener.h
	Code/Mantid/Framework/LiveData/src/ISISLiveEventDataListener.cpp
	Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/ImportMDEventWorkspace.h
	Code/Mantid/Framework/MDEvents/src/ImportMDEventWorkspace.cpp
	Code/Mantid/Framework/MDEvents/test/ImportMDEventWorkspaceTest.h
	Code/Mantid/Framework/Nexus/src/NexusFileIO.cpp
	Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ExperimentInfo.cpp
	Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IEventWorkspace.cpp
	Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDWorkspace.cpp
	Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
	Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp
	Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Quat.cpp
	Code/Mantid/Framework/SINQ/CMakeLists.txt
	Code/Mantid/MantidPlot/docs/python/autogen_api.py.in
	Code/Mantid/MantidPlot/docs/python/source/conf.py.in
	Code/Mantid/MantidPlot/src/ApplicationWindow.cpp
	Code/Mantid/MantidPlot/src/ApplicationWindow.h
	Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/ObjCompAssemblyActor.cpp
	Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataAnalysis.ui
	Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/JumpFit.h
	Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/JumpFit.ui
	Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MuonAnalysis.h
	Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MuonAnalysis.ui
	Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MuonAnalysisResultTableTab.h
	Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Quasi.h
	Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Quasi.ui
	Code/Mantid/MantidQt/CustomInterfaces/src/ConvFit.cpp
	Code/Mantid/MantidQt/CustomInterfaces/src/Fury.cpp
	Code/Mantid/MantidQt/CustomInterfaces/src/FuryFit.cpp
	Code/Mantid/MantidQt/CustomInterfaces/src/JumpFit.cpp
	Code/Mantid/MantidQt/CustomInterfaces/src/MuonAnalysis.cpp
	Code/Mantid/MantidQt/CustomInterfaces/src/MuonAnalysisResultTableTab.cpp
	Code/Mantid/MantidQt/CustomInterfaces/src/Quasi.cpp
	Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/CatalogSearch.ui
	Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/MuonSequentialFitDialog.h
	Code/Mantid/MantidQt/MantidWidgets/src/CatalogSearch.cpp
	Code/Mantid/MantidQt/MantidWidgets/src/MuonSequentialFitDialog.cpp
	Code/Mantid/docs/qtassistant/mediawiki.py
	Code/Mantid/instrument/CRISP_Definition.xml
	Code/Mantid/instrument/CRISP_Parameters.xml
	Code/Mantid/instrument/INTER_Definition.xml
	Code/Mantid/instrument/POLREF_Definition.xml
	Code/Mantid/instrument/POLREF_Parameters.xml
	Code/Mantid/instrument/SURF_Definition.xml
	Code/Mantid/instrument/TOPAZ_Definition_2010.xml
	Code/Mantid/instrument/TOPAZ_Definition_2011-01-01.xml
	Code/Mantid/instrument/TOPAZ_Definition_2011-10-03.xml
	Code/Mantid/instrument/TOPAZ_Definition_2011-10-21.xml
	Code/Mantid/instrument/TOPAZ_Definition_2012-05-25.xml
	Code/Mantid/instrument/TOPAZ_Definition_2012-08-23.xml
	Code/Mantid/scripts/Inelastic/IndirectBayes.py
	Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py
	Code/Mantid/scripts/Interface/ui/reflectometer/refl_gui.py
	Code/Mantid/scripts/Interface/ui/reflectometer/refl_save.py
	Code/Mantid/scripts/Interface/ui/reflectometer/refl_window.py
	Code/Mantid/scripts/Interface/ui/reflectometer/refl_window.ui
	Code/Mantid/scripts/Reflectometry/isis_reflectometry/convert_to_wavelength.py
	Code/Mantid/scripts/Reflectometry/isis_reflectometry/quick.py
	Code/Mantid/scripts/Reflectometry/isis_reflectometry/saveModule.py
	Code/Mantid/scripts/test/ConvertToWavelengthTest.py
	Code/Mantid/scripts/test/SettingsTest.py
Merge branch 'feature/8757_icat_add_invs_num_to_search' into develop. Refs #8757.

Conflicts:

- Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/CatalogSearch.ui