COMMON CORE - Changes to improve css formatting in the templates (style sheets were in the wrong order)  New work on the update to CC display.
Merge remote-tracking branch 'origin/master'