Merge pull request #429 from adamvi/master

Add SGP cohort size argument, UT SGPstateData updates for Norm group prefs and cohort size restrictions