DE662 - Increase number retries to generate unique transaction id.
DE511 - JS animation
US838 - Self employment now coming first before employment.
US887 - Redesign Employment Expenses to be like circs - two free text boxes
Fixing some issues with the tests
DE671:Fixing text changes in Breaks in care
Merge branch 'release' into development

Conflicts:
	c3/conf/cy/S4_careYouProvide.cy.properties
DE671:Fixing text changes in Breaks in care
Merge remote-tracking branch 'origin/development' into integration-pilot

Conflicts:
	c3/app/assets/carers-allowance.scss
	c3/app/assets/javascripts/s2_about_you/g4_nationalityAndResidency.coffee
	c3/app/assets/javascripts/s2_about_you/g8_moreAboutYou.coffee
	c3/app/assets/javascripts/s7_employment/g8_aboutExpenses.coffee
	transactionsDB/get_transaction.sql
DE671:Merge from Development
US896:Remove claim dates / screen titles from questions / page in 'About Other Money'
Fixing issues with templating and not syntactically correct elements.
Merge remote-tracking branch 'origin/integration' into integration-pilot

Conflicts:
	c3/app/assets/prompt-panels.scss
US887 - Redesign Employment Expenses - removed full stop from two props
US887 - Redesign Employment Expenses to be like circs - two free text boxes
Merge remote-tracking branch 'origin/integration-pilot' into integration-pilot
Probably by a bad merge, some files with previous tasks were re-written with old code.
Now using xml commons version 2.0.15