Conflicts:
	App/App.pro
	App/inc/TestFormFactors.h
	App/src/StandardSamples.cpp
	App/src/TestFormFactors.cpp
	Core/Core.pro
	Core/FormFactors/inc/FormFactorCylinder.h
	Core/FormFactors/inc/FormFactorEllipsoid.h
	Core/FormFactors/inc/FormFactorFullSphere.h
	Core/FormFactors/inc/FormFactorPrism3.h
	Core/FormFactors/inc/FormFactorSphere.h
	Core/FormFactors/src/FormFactorBox.cpp
	Core/FormFactors/src/FormFactorCylinder.cpp
	Core/FormFactors/src/FormFactorEllipsoid.cpp
	Core/FormFactors/src/FormFactorFullSphere.cpp
	Core/FormFactors/src/FormFactorSphere.cpp
	shared.pri