Move income tax question to income page as is more relevant to ask at this stage
Fix tests to use new layout
Merge pull request #472 from ministryofjustice/patch/tax-ques

Move income tax question to income page