Merge pull request #199 from dbetebenner/master

Update to Adams branch
Update UT SGP Norm Group Preferences
Update/Correct UT SGP Norm Group Preferences
Merge pull request #200 from adamvi/master

Update UT Norm Group Prefs
Updating SGPstateData