Chris watson develop cwatson 12 19 release

Merging CCs changes back into release branch so that I can update the C-CDA results tab