habres - move G7OtherEEAStateOrSwitzerland to S2 About You
habres - fix broken tests
Merge branch 'development-habres' into development-habres-work

Conflicts:
	c3/app/controllers/s2_about_you/G7OtherEEAStateOrSwitzerland.scala
	c3/app/views/s2_about_you/g7_otherEEAStateOrSwitzerland.scala.html
	c3/app/xml/AssistedDecision.scala
	c3/test/controllers/s2_about_you/G7OtherEEAStateOrSwitzerlandSpec.scala
	c3/test/resources/functional_scenarios/ClaimScenario_TestCase1.csv
	c3/test/resources/functional_scenarios/ClaimScenario_TestCase10.csv
	c3/test/resources/functional_scenarios/ClaimScenario_TestCase2.csv
	c3/test/resources/functional_scenarios/ClaimScenario_TestCase3.csv
	c3/test/resources/functional_scenarios/ClaimScenario_TestCase4.csv
	c3/test/resources/functional_scenarios/ClaimScenario_TestCase5.csv
	c3/test/resources/functional_scenarios/ClaimScenario_TestCase6.csv
	c3/test/resources/functional_scenarios/ClaimScenario_TestCase7.csv
	c3/test/resources/functional_scenarios/ClaimScenario_TestCase8.csv
	c3/test/resources/functional_scenarios/ClaimScenario_TestCase9.csv
habres - add merged files
habres - fix merge test failures