working on adding sp2 setting feature
moving to work
Merge remote-tracking branch 'origin/master' into peptide_building
Merge remote-tracking branch 'origin/peptide_building'