FLUID-4323: Implemented "simplified content".
Merge remote-tracking branch 'upstream/demo' into demo
FLUID-4323: Fixed the way to feed in the content container into simplifiedContent component.
Merge remote-tracking branch 'upstream/demo' into demo
FLUID-4323: Moved the content selector into options.selectors block.
Merge remote-tracking branch 'cindyli/demo' into demo

* cindyli/demo:
  FLUID-4323: Moved the content selector into options.selectors block.
  FLUID-4323: Fixed the way to feed in the content container into simplifiedContent component.
  FLUID-4323: Implemented "simplified content".