Merge branch 'sm7' into 'develop'

GUI/Model/Sample/MesoCrystalItem.cpp

Resample/Particle/ReParticle.cpp

Resample/Processed/Slicer.cpp

Sample/HardParticle/FormFactorCone.h

Sample/HardParticle/FormFactorCylinder.h

Sample/HardParticle/FormFactorEllipsoidalCylinder.h

Sample/HardParticle/FormFactorFullSphere.h

Sample/HardParticle/FormFactorFullSpheroid.h

Sample/HardParticle/FormFactorHemiEllipsoid.h

Sample/HardParticle/FormFactorLongBoxGauss.h

Sample/HardParticle/FormFactorLongBoxLorentz.h

Sample/HardParticle/FormFactorTruncatedSphere.h

Sample/HardParticle/FormFactorTruncatedSpheroid.h

Sample/HardParticle/IFormFactorPolyhedron.h

Sample/HardParticle/IFormFactorPrism.h

Sample/HardParticle/IProfileRipple.h

Sample/Particle/IBornFF.cpp

Sample/Particle/IBornFF.h

Sample/Particle/MesoCrystal.cpp

Sample/Particle/Particle.h