Merge branch 'TestFit02' into develop

Conflicts:
	Core/Core.pro
	Core/PythonAPI/src/FormFactorBox.pypp.cpp
	Core/PythonAPI/src/FormFactorCrystal.pypp.cpp
	Core/PythonAPI/src/FormFactorCylinder.pypp.cpp
	Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp
	Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp
	Core/PythonAPI/src/FormFactorGauss.pypp.cpp
	Core/PythonAPI/src/FormFactorLorentz.pypp.cpp
	Core/PythonAPI/src/FormFactorParallelepiped.pypp.cpp
	Core/PythonAPI/src/FormFactorPrism3.pypp.cpp
	Core/PythonAPI/src/FormFactorPyramid.pypp.cpp
	Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp
	Core/PythonAPI/src/HomogeneousMaterial.pypp.cpp
	Core/PythonAPI/src/IFormFactorBorn.pypp.cpp
	Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp
	Core/PythonAPI/src/IMaterial.pypp.cpp
	Core/PythonAPI/src/ParameterPool.pypp.cpp
	Core/Samples/inc/HomogeneousMaterial.h
	Core/Samples/inc/IMaterial.h
	Core/Samples/src/IMaterial.cpp
	Core/Tools/inc/MathFunctions.h
	Fit/Fit.pro
	Fit/PythonAPI/src/ndimdata_t.pypp.cpp