Duplicated code removed in all the Settings classes
Merge branch 'merging'
More refactoring ...
Merge branch 'merging'
Fixed a bug in QualityIndicator
Merge branch 'merging'
Resolving conflicts
Fixing conflicts
SMPSO refactorized