FLUID-4919: Adding FluidIoC to the progress manual test.
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