Add TCRP Norm group prefs and other changes for TCRP
Merge pull request #480 from dbetebenner/master

Refinement of combineSGP and update of SGPstateData and beginning to better depict targets on student growth plots
rename 'sgp.iter' when used as an integer for indexing to avoid confusion with sgp.iter lists elsewhere
make sure tmp.lookup is ordered correctly.  Was re-ordering a grade progression (6, EOCT, 8) to (EOCT, 6, 8)
Ensure lookup table is ordered by years
Merge pull request #481 from dbetebenner/master

Update of combineSGP to produce CURRENT SGP TARGET by default
Merge pull request #482 from dbetebenner/master

Update of studentGrowthPlot and modification to checkSGP to add CURRENT ...
Fix merge conflicts
Merge pull request #483 from dbetebenner/master

Update of student growth plots to depict targets
Merge branch 'master' of github.com:CenterForAssessment/SGP
Add TCRP baseline matrices and update norm group prefs
Merge pull request #479 from adamvi/master

Add TCRP Norm group prefs and other changes for TCRP
Fix duplicate in TCRP norm group preference
Merge pull request #484 from adamvi/master

Fix duplicate in TCRP norm group preference
Updates to studentGrowthPlot