US538: Refactored g7_breaksIncare.scala.html and added FormSpec
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	c3/app/views/circs/s2_report_changes/g7_breaksInCare.scala.html