Merge branch 'FFCuboctahedron' into develop

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