merged dev into statsbranch, fixed bug where good group files didn't work