Merge remote-tracking branch 'upstream/master'

Framework/API/inc/MantidAPI/Algorithm.h

Framework/API/inc/MantidAPI/IFunction.h

Framework/API/inc/MantidAPI/Sample.h

Framework/API/src/Algorithm.cpp

Framework/API/src/IFunction.cpp

Framework/API/src/Sample.cpp

Framework/Algorithms/inc/MantidAlgorithms/AlignDetectors.h

...k/Algorithms/inc/MantidAlgorithms/CreateSampleWorkspace.h

...ework/Algorithms/inc/MantidAlgorithms/He3TubeEfficiency.h

Framework/Algorithms/inc/MantidAlgorithms/ScaleX.h

Framework/Algorithms/inc/MantidAlgorithms/WorkspaceJoiners.h

Framework/Algorithms/src/AddPeak.cpp

Framework/Algorithms/src/AlignDetectors.cpp

Framework/Algorithms/src/CreateSampleWorkspace.cpp

Framework/Algorithms/src/DeadTimeCorrection.cpp

Framework/Algorithms/src/He3TubeEfficiency.cpp

Framework/Algorithms/src/ScaleX.cpp

Framework/Algorithms/src/WorkspaceJoiners.cpp

Framework/Crystal/src/OptimizeCrystalPlacement.cpp

...CurveFitting/FuncMinimizers/LevenbergMarquardtMinimizer.h