FLUID-4740: Removed new low contrast theme images from old webapp dir
FLUID-4919: Adding FluidIoC to the progress manual test.
Merge remote-tracking branch 'heidi/FLUID-4740'

* heidi/FLUID-4740:
  FLUID-4740: Removed new low contrast theme images from old webapp dir
Merge branch 'master' into FLUID-4907
FLUID-4907: removed cross dependencies

Removed the cross dependencies between the primary and auxiliary builders. This was achieved by having them take an empty option for the necessary fields. The builder, which uses the primary and auxiliary builders is responsible for setting the configuration between them.
FLUID-4907: Moved primaryBuilder to a subcomponent

Using the primary builder as a subcomponent of builder instead of being used as a grade. This works around the FLUID-5101. Also updated the demo to be initialized in manner more closely aligned with what we'd expect an integrator to use.
FLUID-4907: suppliedPrimary gradeName upated

The suppliedPrimary gradeName used internally by the primaryBuilder, now uses fluid.allocateGUID to create a unique gradeName every time it is used. This is to avoid a case where multiple calls to the builder will override the defaults for the grade.
Merge branch 'master' into FLUID-4907
Merge remote-tracking branch 'justin/FLUID-4907' into FLUID-4907
FLUID-4907: added comments to primary builder.
Merge remote-tracking branch 'michelle/FLUID-4919'

* michelle/FLUID-4919:
  FLUID-4919: Adding FluidIoC to the progress manual test.
FLUID-5107: Removing the Sakai integration demo.
Merge remote-tracking branch 'michelle/FLUID-5107'

* michelle/FLUID-5107:
  FLUID-5107: Removing the Sakai integration demo.
Merge branch 'master' into FLUID-4907

Conflicts:
	src/integration-demos/sakai/html/ui-options-fss-sakai.html