US536 - start to fix past/present for different languages
US536 - fix broken tests

Conflicts:

	c3/conf/cy/layout.cy.properties
US536 - Translation updates

Conflicts:

	c3/app/views/s2_about_you/g5_abroad_for_more_than_52_weeks.scala.html
	c3/conf/cy/S9_otherMoney.cy.properties
	c3/conf/cy/layout.cy.properties
Merge branch 'release' into release-work
US536 - enable translation of feedback
US536 - encode declaration messages to pick up Welsh characters
US536 - encode declaration messages to pick up Welsh characters
US536 - Prove past/present tense fields work with new strategy
Merge branch 'release' of https://github.com/CarersBeta/ClaimCapture into release
Merge branch 'release' into release-work
US536 - Ensure S7 and S8 G10 and G12 display past/present error messages and labels correctly
US536 - Past/Present labels for employment job details
US536 - Past/Present labels added for employment last wage
US536 - Past/Present tense employment additional wage details
US536 - Past/Present employment pension schemes
US536 - Past/Present labels for employment about expenses
US536 - Past/Present labels added for employment necessary expenses
US536 - Remove old method
US536 - Past/Present self employment your accounts
US536 - Past/Present labels for self employment pensions and expenses