Conflicts:
	Tests/UnitTests/TestCore/main.cpp

Conflicts:
	Core/PythonAPI/src/Beam.pypp.cpp
	Core/PythonAPI/src/Crystal.pypp.cpp
	Core/PythonAPI/src/Detector.pypp.cpp
	Core/PythonAPI/src/FTDistribution2DCauchy.pypp.cpp
	Core/PythonAPI/src/FormFactorBox.pypp.cpp
	Core/PythonAPI/src/FormFactorCone.pypp.cpp
	Core/PythonAPI/src/FormFactorCrystal.pypp.cpp
	Core/PythonAPI/src/FormFactorCylinder.pypp.cpp
	Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp
	Core/PythonAPI/src/FormFactorEllipsoid.pypp.cpp
	Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp
	Core/PythonAPI/src/FormFactorFullSpheroid.pypp.cpp
	Core/PythonAPI/src/FormFactorGauss.pypp.cpp
	Core/PythonAPI/src/FormFactorHemiSpheroid.pypp.cpp
	Core/PythonAPI/src/FormFactorLorentz.pypp.cpp
	Core/PythonAPI/src/FormFactorParallelepiped.pypp.cpp
	Core/PythonAPI/src/FormFactorPrism3.pypp.cpp
	Core/PythonAPI/src/FormFactorPrism6.pypp.cpp
	Core/PythonAPI/src/FormFactorPyramid.pypp.cpp
	Core/PythonAPI/src/FormFactorSphere.pypp.cpp
	Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp
	Core/PythonAPI/src/IClusteredParticles.pypp.cpp
	Core/PythonAPI/src/ICompositeSample.pypp.cpp
	Core/PythonAPI/src/IDecoration.pypp.cpp
	Core/PythonAPI/src/IDetectorResolution.pypp.cpp
	Core/PythonAPI/src/IFTDistribution2D.pypp.cpp
	Core/PythonAPI/src/IFormFactor.pypp.cpp
	Core/PythonAPI/src/IFormFactorBorn.pypp.cpp
	Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp
	Core/PythonAPI/src/IInterferenceFunction.pypp.cpp
	Core/PythonAPI/src/IParameterized.pypp.cpp
	Core/PythonAPI/src/IResolutionFunction2D.pypp.cpp
	Core/PythonAPI/src/ISample.pypp.cpp
	Core/PythonAPI/src/ISampleBuilder.pypp.cpp
	Core/PythonAPI/src/Instrument.pypp.cpp
	Core/PythonAPI/src/InterferenceFunction1DParaCrystal.pypp.cpp
	Core/PythonAPI/src/InterferenceFunction2DLattice.pypp.cpp
	Core/PythonAPI/src/InterferenceFunction2DParaCrystal.pypp.cpp
	Core/PythonAPI/src/InterferenceFunctionNone.pypp.cpp
	Core/PythonAPI/src/LatticeBasis.pypp.cpp
	Core/PythonAPI/src/Layer.pypp.cpp
	Core/PythonAPI/src/LayerInterface.pypp.cpp
	Core/PythonAPI/src/LayerRoughness.pypp.cpp
	Core/PythonAPI/src/MesoCrystal.pypp.cpp
	Core/PythonAPI/src/MultiLayer.pypp.cpp
	Core/PythonAPI/src/Particle.pypp.cpp
	Core/PythonAPI/src/ParticleCoreShell.pypp.cpp
	Core/PythonAPI/src/ParticleDecoration.pypp.cpp
	Core/PythonAPI/src/ParticleInfo.pypp.cpp
	Core/PythonAPI/src/PositionParticleInfo.pypp.cpp
	Core/PythonAPI/src/ResolutionFunction2DSimple.pypp.cpp
	Core/PythonAPI/src/Simulation.pypp.cpp

Added correct reference files for IsGISAXS06 tests after removing bug from IsGISAXS and BornAgain code

Added Fourier transformed 2d Gaussian; removed strange looking denominator in InterferenceFunction2DLattice.cpp; regenerated python API

The issue 506 is resolved.

PythonAPI now hanbdles pure virtual method automatically, so should be save to use pure virtual in our CPP interfaces