Merge last updates fom master
Resolve "Add most commonly used form-factors for diluted particles and polymers to the small angle scattering package"
Resolve "Add most commonly used form-factors for diluted particles and polymers to the small angle scattering package"