Conflicts:
	Core/PythonAPI/src/PythonModule.cpp
	Fit/PythonAPI/src/ISquaredFunction.pypp.cpp
	Fit/PythonAPI/src/PythonModule.cpp
	Fit/PythonAPI/src/SquaredFunctionDefault.pypp.cpp
	Fit/PythonAPI/src/SquaredFunctionWhichOnlyWorks.pypp.cpp
	Fit/PythonAPI/src/SquaredFunctionWithGaussianError.pypp.cpp
	Fit/PythonAPI/src/SquaredFunctionWithSystematicError.pypp.cpp