Not ready for merge
More UX changes
Merge branch 'master' into UXChanges
Fix feature tests
Merge branch 'master' into UXChanges

Conflicts:
	redundancy_payments_alpha/feature_tests/discrepancies.feature
Merge pull request #56 from InsolvencyService/UXChanges

UX changes