Merge branch 'master' of /Users/leon/Projects/Carers/ClaimCapture with conflicts.
Merge branch 'master' of github.com:CarersBeta/ClaimCapture

Conflicts:
	c3/conf/messages.en
	c3/conf/routes
Merge remote-tracking branch 'origin/master'

Conflicts:
	c3/app/models/domain/CareYouProvide.scala
init for care you provide g8 page
Merge branch 'master' of github.com:CarersBeta/ClaimCapture