Merge remote-tracking branch 'origin/master' into external_gtest

Framework/Algorithms/inc/MantidAlgorithms/CalculateDIFC.h

...rk/Algorithms/inc/MantidAlgorithms/ConvertSpectrumAxis2.h

...Algorithms/inc/MantidAlgorithms/CreateLogTimeCorrection.h

Framework/Algorithms/src/AddPeak.cpp

Framework/Algorithms/src/CalculateDIFC.cpp

Framework/Algorithms/src/ConvertDiffCal.cpp

Framework/Algorithms/src/ConvertSpectrumAxis.cpp

Framework/Algorithms/src/ConvertSpectrumAxis2.cpp

Framework/Algorithms/src/ConvertUnitsUsingDetectorTable.cpp

Framework/Algorithms/src/CreateLogTimeCorrection.cpp

Framework/Algorithms/src/DetectorDiagnostic.cpp

Framework/Algorithms/src/RemoveLowResTOF.cpp

Framework/Algorithms/test/BinaryOperationTest.h

Framework/Algorithms/test/CheckWorkspacesMatchTest.h

Framework/Algorithms/test/CommutativeBinaryOperationTest.h

Framework/Algorithms/test/CompareWorkspacesTest.h

Framework/Algorithms/test/ConvertSpectrumAxisTest.h

Framework/Algorithms/test/ExponentialTest.h

Framework/Algorithms/test/LogarithmTest.h

Framework/Algorithms/test/MultiplyDivideTest.in.h