FLUID-4971: Moved full page UIO demos into manual-tests
FLUID-4971: Moved full page UIO demos into manual-tests
Merge branch 'FLUID-4981-correct' into FLUID-4971
Merge branch 'FLUID-4981-correct' into FLUID-4971
Merge branch 'FLUID-4981-correct' into FLUID-4971
FLUID-4971: Edited manual test readme, removed 'return to site' links, moved test js out of demo js, edited demo text. Cancel buttons still broken
Merge branch 'FLUID-4981-correct' into FLUID-4971
FLUID-4971: Removed uio-demo-theme class in demos to use default
FLUID-4971: CSS formatting tweaks
FLUID-4971: Detabbed css
FLUID-4971: Detabbed css
FLUID-4971: Detabbed css
FLUID-4971: Detabbed css
FLUID-4971: Removed unused function call in demo
Merge remote-tracking branch 'heidiv/FLUID-4971'

* heidiv/FLUID-4971:
  FLUID-4971: Removed unused function call in demo
  FLUID-4971: Detabbed css
  FLUID-4971: Detabbed css
  FLUID-4971: Detabbed css
  FLUID-4971: Detabbed css
  FLUID-4971: CSS formatting tweaks
  FLUID-4971: Removed uio-demo-theme class in demos to use default
  FLUID-4971: Edited manual test readme, removed 'return to site' links, moved test js out of demo js, edited demo text. Cancel buttons still broken
  FLUID-4971: Moved full page UIO demos into manual-tests
  FLUID-4971: Moved full page UIO demos into manual-tests

Conflicts:
	src/webapp/demos/uiOptions/js/uiOptionsDemo.js
FLUID-4971: Fixed the full page manual tests.
Merge remote-tracking branch 'cindyli/FLUID-4971'

* cindyli/FLUID-4971:
  FLUID-4971: Fixed the full page manual tests.
  FLUID-4971: Removed unused function call in demo
  FLUID-4971: Detabbed css
  FLUID-4971: Detabbed css
  FLUID-4971: Detabbed css
  FLUID-4971: Detabbed css
  FLUID-4971: CSS formatting tweaks
  FLUID-4971: Removed uio-demo-theme class in demos to use default
  FLUID-4971: Edited manual test readme, removed 'return to site' links, moved test js out of demo js, edited demo text. Cancel buttons still broken
  FLUID-4971: Moved full page UIO demos into manual-tests
  FLUID-4971: Moved full page UIO demos into manual-tests