US819 - Merge Consent with declaration
US819 - taken out div
Merge branch 'integration' into US819ConsentAndDeclarationMerge

Conflicts:
	c3/app/controllers/Mappings.scala
	c3/app/controllers/s10_information/G1AdditionalInfo.scala
	c3/app/controllers/s12_consent_and_declaration/G1Consent.scala
	c3/app/controllers/s12_consent_and_declaration/G3Declaration.scala
	c3/app/views/s12_consent_and_declaration/g1_consent.scala.html
	c3/conf/routes
	c3/test/controllers/s10_information/G1AdditionalInformationIntegrationSpec.scala
	c3/test/controllers/s12_consent_and_declaration/G1ConsentIntegrationSpec.scala
	c3/test/controllers/s12_consent_and_declaration/G1ConsentSpec.scala
	c3/test/utils/pageobjects/ClaimPageFactory.scala
	c3/test/utils/pageobjects/s12_consent_and_declaration/G1ConsentPage.scala
	c3/test/utils/pageobjects/s12_consent_and_declaration/G3DeclarationPage.scala
Merge branch 'integration' into US819ConsentAndDeclarationMerge
US819 - Merge from integration