US542 - remove Employment guard questions from About You, in preparation to add them into the Employment section
US528 - continuing development
US542 - continued dev
US528 - Fix broken tests
Merge branch 'development18' into development18-work-merge

Conflicts:
	c3/app/controllers/s2_about_you/G9Employment.scala
	c3/app/controllers/s6_education/Education.scala
	c3/app/views/s2_about_you/g9_employment.scala.html
	c3/conf/routes
	c3/test/controllers/s2_about_you/G10CompletedIntegrationSpec.scala
	c3/test/controllers/s2_about_you/G9EmploymentIntegrationSpec.scala
	c3/test/controllers/s3_your_partner/G1YourPartnerPersonalDetailsIntegrationSpec.scala
	c3/test/controllers/s4_care_you_provide/CareYouProvideIntegrationSpec.scala
	c3/test/controllers/s6_education/EducationIntegrationSpec.scala
	c3/test/controllers/s7_employment/EmploymentIntegrationSpec.scala
	c3/test/controllers/s8_self_employment/G1AboutSelfEmploymentIntegrationSpec.scala
	c3/test/controllers/s8_self_employment/G2SelfEmploymentYourAccountsIntegrationSpec.scala
	c3/test/controllers/s8_self_employment/G4SelfEmploymentPensionsAndExpensesIntegrationSpec.scala
	c3/test/controllers/s8_self_employment/G5ChildcareExpensesWhileAtWorkIntegrationSpec.scala
	c3/test/controllers/s8_self_employment/G7ExpensesWhileAtWorkIntegationSpec.scala
	c3/test/controllers/s8_self_employment/G9CompletedIntegrationSpec.scala
	c3/test/resources/ClaimScenarioXmlMapping.csv
	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
	c3/test/utils/pageobjects/ClaimPageFactory.scala
	c3/test/utils/pageobjects/s2_about_you/G9EmploymentPage.scala
Merge branch 'development18' into development18-work-merge
Rename AboutType Employment Guard questions to be prefixed with Employment
Refactor S7 G5 to G6
Refactor S7 G4 to G5
Refactor S7 G3 to G4
Refactor S7 G2 to G3
Refactor S7 G1 to G2
Refactor S7 G0 to G1
Merge branch 'development18' into development18-work-merge

Conflicts:
	c3/test/controllers/s2_about_you/G8MoreAboutYouIntegrationSpec.scala
	c3/test/controllers/s2_about_you/G9EmploymentIntegrationSpec.scala
	c3/test/controllers/s7_employment/G10ChildcareExpensesIntegrationSpec.scala
	c3/test/controllers/s7_employment/G5LastWageIntegrationSpec.scala
	c3/test/controllers/s7_employment/G6AdditionalWageDetailsIntegrationSpec.scala
	c3/test/controllers/s7_employment/G7PensionSchemesIntegrationSpec.scala
	c3/test/controllers/s7_employment/G9NecessaryExpensesIntegrationSpec.scala
	c3/test/controllers/s8_self_employment/G2SelfEmploymentYourAccountsIntegrationSpec.scala
	c3/test/controllers/s8_self_employment/G4SelfEmploymentPensionsAndExpensesIntegrationSpec.scala
	c3/test/controllers/s8_self_employment/G7ExpensesWhileAtWorkIntegationSpec.scala
	c3/test/controllers/s8_self_employment/G9CompletedIntegrationSpec.scala
	c3/test/utils/pageobjects/ClaimPageFactory.scala
	c3/test/utils/pageobjects/s2_about_you/G9EmploymentPage.scala
	c3/test/utils/pageobjects/s7_employment/G2BeenEmployedPage.scala
	c3/test/utils/pageobjects/s7_employment/G3JobDetailsPage.scala
	c3/test/utils/pageobjects/s7_employment/G4EmployerContactDetailsPage.scala
	c3/test/utils/pageobjects/s7_employment/G5LastWagePage.scala
	c3/test/utils/pageobjects/s7_employment/G6AdditionalWageDetailsPage.scala
Push to get it into development18 branch, tests still failing