Merge branch 'master' into 19220_indirectILL_convertQ

CMakeLists.txt

Framework/API/CMakeLists.txt

Framework/API/inc/MantidAPI/ComponentInfo.h

Framework/API/inc/MantidAPI/CompositeFunction.h

Framework/API/inc/MantidAPI/DetectorInfo.h

Framework/API/inc/MantidAPI/ExperimentInfo.h

Framework/API/inc/MantidAPI/InfoComponentVisitor.h

Framework/API/src/ComponentInfo.cpp

Framework/API/src/CompositeFunction.cpp

Framework/API/src/DetectorInfo.cpp

Framework/API/src/ExperimentInfo.cpp

Framework/API/src/IFunction.cpp

Framework/API/src/IPowderDiffPeakFunction.cpp

Framework/API/src/IncreasingAxisValidator.cpp

Framework/API/src/InfoComponentVisitor.cpp

Framework/API/src/MatrixWorkspace.cpp

Framework/API/src/NumericAxisValidator.cpp

Framework/API/src/Progress.cpp

Framework/API/src/Run.cpp

Framework/API/src/SpectraAxisValidator.cpp