Note that this does not compile, fixes in next commit.

Conflicts:
	Framework/API/inc/MantidAPI/MatrixWorkspace.h
	Framework/Algorithms/src/AlignDetectors.cpp
	Framework/Algorithms/src/CreateSampleWorkspace.cpp
	Framework/Algorithms/src/GetAllEi.cpp
	Framework/Algorithms/src/ResampleX.cpp
	Framework/Algorithms/src/WorkspaceJoiners.cpp
	Framework/Algorithms/test/ApplyDetailedBalanceTest.h
	Framework/Algorithms/test/ClearMaskFlagTest.h
	Framework/Algorithms/test/CloneWorkspaceTest.h
	Framework/Algorithms/test/CorrectKiKfTest.h
	Framework/Algorithms/test/DiffractionFocussing2Test.h
	Framework/Algorithms/test/He3TubeEfficiencyTest.h
	Framework/Algorithms/test/ModeratorTzeroLinearTest.h
	Framework/Algorithms/test/ModeratorTzeroTest.h
	Framework/Algorithms/test/RemoveBackgroundTest.h
	Framework/Crystal/src/OptimizeCrystalPlacement.cpp
	Framework/CurveFitting/test/Algorithms/EstimatePeakErrorsTest.h
	Framework/CurveFitting/test/Functions/KerenTest.h
	Framework/DataHandling/src/LoadTOFRawNexus.cpp
	Framework/DataHandling/test/GroupDetectors2Test.h
	Framework/DataHandling/test/GroupDetectorsTest.h
	Framework/DataHandling/test/LoadDetectorInfoTest.h
	Framework/DataHandling/test/MaskDetectorsTest.h
	Framework/DataObjects/inc/MantidDataObjects/Histogram1D.h
	Framework/DataObjects/src/EventWorkspace.cpp
	Framework/DataObjects/test/EventWorkspaceTest.h
	Framework/Kernel/inc/MantidKernel/cow_ptr.h
	Framework/TestHelpers/src/WorkspaceCreationHelper.cpp
	MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionPresenter.cpp
	MantidQt/CustomInterfaces/src/Indirect/ResNorm.cpp