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

Conflicts:
	App/inc/FitSuiteObserverFactory.h
	Core/Fitting/inc/FitSuite.h
	Core/PythonAPI/src/Simulation.pypp.cpp
	Core/Tools/src/OutputDataReadStrategy.cpp

- 3rd person form: "Does" this or that.
- For all const methods that return something: "Returns" ...
- For boolean return value: "Returns true if " ...

Conflicts:
	App/inc/FitSuiteObserverFactory.h
	App/src/FitSuiteObserverFactory.cpp
	Core/Core.pro
	Core/Tools/src/OutputDataReadStrategy.cpp
	Core/Tools/src/OutputDataWriteStrategy.cpp

Main file FunctionalTests/test_all.py which runs 4 kind of functional tests all together: TestCore, TestPyCore, TestFit, TestPyFit

Doxygen comments.

Formfactors: integrand of imaginary part is real.

Transform reduced to 3x3 rotation.

Tried removal of Rotate from Geometry which however is required by IsGISAXS07.
Will be reverted in a minuted.