Merge branch 'ff97' into 'develop'

Base/Vector/RotMatrix.cpp

Base/Vector/RotMatrix.h

GUI/View/Realspace/RealSpaceBuilderUtils.cpp

Resample/Options/SimulationOptions.cpp

Sample/HardParticle/FormFactorAnisoPyramid.cpp

Sample/HardParticle/FormFactorAnisoPyramid.h

Sample/HardParticle/FormFactorBox.cpp

Sample/HardParticle/FormFactorBox.h

Sample/HardParticle/FormFactorCone.cpp

Sample/HardParticle/FormFactorCone.h

Sample/HardParticle/FormFactorCone6.cpp

Sample/HardParticle/FormFactorCone6.h

Sample/HardParticle/FormFactorCuboctahedron.cpp

Sample/HardParticle/FormFactorCuboctahedron.h

Sample/HardParticle/FormFactorCylinder.cpp

Sample/HardParticle/FormFactorCylinder.h

Sample/HardParticle/FormFactorEllipsoidalCylinder.cpp

Sample/HardParticle/FormFactorEllipsoidalCylinder.h

Sample/HardParticle/FormFactorFullSphere.cpp

Sample/HardParticle/FormFactorFullSphere.h