Merge branch 'FLUID-4323' into FLUID-4323-demo
FLUID-4323: Clean-up of HTML and improvements to semantics of markup.
Merge branch 'demo' into FLUID-4323-demo
FLUID-4323: Changes for high-contrast.
Merge branch 'demo' into FLUID-4323-demo
Merge branch 'FLUID-4323' into FLUID-4323-demo
FLUID-4323: More changes for high-contrast.
Merge branch 'demo' into FLUID-4323-demo

Conflicts:
	src/webapp/integration-demos/uiOptions/ClimateChange.html
Merge branch 'FLUID-4323' into FLUID-4323-demo
Merge remote-tracking branch 'acheetham/FLUID-4323-demo' into demo

* acheetham/FLUID-4323-demo:
  FLUID-4323: More changes for high-contrast.
  FLUID-4323: Changes for high-contrast.
  FLUID-4323: Clean-up of HTML and improvements to semantics of markup.