Conflicts:
	App/inc/ROOTMinimizerFunction.h
	App/src/TestFumiliLMA.cpp
	App/src/TestToyExperiment.cpp
	Core/Tools/src/FitSuite.cpp
	UnitTests/TestCore/ParameterPoolTest.h

Conflicts:
	Core/PythonAPI/src/PythonInterface_classes_1.cpp
	Core/PythonAPI/src/PythonInterface_classes_3.cpp

Conflicts:
	App/src/IsGISAXSTools.cpp
	App/src/TestIsGISAXS9.cpp
	Core/Algorithms/src/GISASExperiment.cpp
	Core/Tools/inc/AxisDouble.h
	Core/Tools/inc/OutputData.h
	Core/Tools/src/AxisDouble.cpp
	shared.pri

ToyExperiment is working now with GSL minimizers, check for validity of configuration in ROOTMinimizer