Conflicts:
	Framework/Algorithms/src/ExtractSpectra.cpp
	Framework/Algorithms/src/Q1D2.cpp
	Framework/Algorithms/src/RadiusSum.cpp
	Framework/Algorithms/src/SmoothNeighbours.cpp
	Framework/Algorithms/src/SofQWNormalisedPolygon.cpp
	Framework/Crystal/src/AnvredCorrection.cpp
	Framework/Crystal/src/IntegratePeakTimeSlices.cpp
	Framework/DataHandling/src/CompressEvents.cpp
	Framework/DataHandling/src/GroupDetectors2.cpp
	Framework/DataHandling/src/LoadGSS.cpp
	Framework/DataHandling/src/LoadSpice2D.cpp
	Framework/DataHandling/src/SaveAscii2.cpp
	Framework/DataHandling/src/SaveDetectorsGrouping.cpp
	Framework/DataHandling/src/SaveMask.cpp
	Framework/DataObjects/src/EventWorkspace.cpp
	Framework/TestHelpers/src/SANSInstrumentCreationHelper.cpp
	MantidQt/CustomInterfaces/src/Indirect/IndirectDataReductionTab.cpp
	MantidQt/CustomInterfaces/src/Indirect/IndirectSymmetrise.cpp
	MantidQt/MantidWidgets/src/InstrumentView/InstrumentWidgetPickTab.cpp