updated Costmetics
Merge remote-tracking branch 'origin/release' into development

Conflicts:
	c3/app/views/s9_self_employment/g9_completed.scala.html
	c3/conf/messages.en