Updated HTML conditionals.
Merge branch 'development' into release

Conflicts:
	c3/app/views/common/govMainDefault.scala.html
PageObject - Added possibility to click on button change within a table. Use it to rewrite one test of G4TripIntegrationSpec that fails randomly.
Merge branch 'development' of https://github.com/CarersBeta/ClaimCapture into development
PDf - moved questions about care you provide to Evidence list.
Fixed unit tests of xml.careeSpec to match 'Not asked' values.
Merge branch 'development' of https://github.com/CarersBeta/ClaimCapture into development
Merge branch 'development' of https://github.com/CarersBeta/ClaimCapture into development
Merge branch 'development' into release
DE198 change breaks in care question labels. The rally defect says there are 4 places but i have only found 2
Integration tests - removed unnecessary parameters. PageObjects - read system property waitDuration to set up default duration.
DE199
DE201 should not remember yes/no upon stating entering a trip and returning, forcing the user to to enter yes/no
Merge branch 'development' of https://github.com/CarersBeta/ClaimCapture into development
Fix label for self employment huard question
Added Employment HowOften to evidence list so it appears for each job
XML/PDF - When Did you arrive to UK moved to EvidenceList and date set to 'Not asked' in XML. Required Schema update.
US296 global find and replace 'look after' with 'care for'
US288
US288 Changes to Time Abroad titles