Don't show zero income if on passported benefits
Add ethnicity groups
Merge pull request #420 from ministryofjustice/patch/zero-income

Don't show zero income if on passported benefits
Switch diversity questions to appear in 1 column