Conflicts:
	Core/PythonAPI/src/FormFactorHemiEllipsoid.pypp.cpp
	Core/PythonAPI/src/FormFactorSpheroid.pypp.cpp
	Core/PythonAPI/src/PythonModule.cpp
	Core/python_module.pri

EllipsoidalCylinder and HemiEllipsoid commented out in StandardSamples.cpp

Conflicts:
	App/inc/StandardSamples.h
	App/src/SampleFactory.cpp
	App/src/StandardSamples.cpp
	Core/PythonAPI/src/FormFactorCone.pypp.cpp
	Core/PythonAPI/src/FormFactorEllipsoid.pypp.cpp
	Core/PythonAPI/src/FormFactorFullSpheroid.pypp.cpp
	Core/PythonAPI/src/FormFactorHemiSpheroid.pypp.cpp
	Core/PythonAPI/src/FormFactorPrism6.pypp.cpp
	Tests/UnitTests/TestCore/FormFactorTest.h

New form factors for Spheroid, FullSpheroid, EllipsoidalCylinder, HemiEllipsoid (with Bessel functions of real variables)

1. TRange
2. AxisBin

Removed FTDistribution2DGate and FTDistribution2DCone because unphysical (will give rise to negative intensities for interference functions)