US681 - fix nationality page

Conflicts:
	c3/app/assets/javascripts/s2_about_you/g4_nationalityAndResidency.coffee
Merge branch 'integration' into integration-work

Conflicts:
	c3/app/assets/javascripts/s2_about_you/g4_nationalityAndResidency.coffee