GPII-136: Added demo images, image descriptions, and themed versions
GPII-136: Moved descrips below imgs
Merge branch 'master' into GPII-136

Conflicts:
	demos/discoveryTool/demo.css
	demos/discoveryTool/index.html
GPII-136: Moved text descriptions of images into <details> where details are not displayed by default
Merge remote-tracking branch 'heidi/GPII-136'

* heidi/GPII-136:
  GPII-136: Moved text descriptions of images into <details> where details are not displayed by default
  GPII-136: Moved descrips below imgs
  GPII-136: Added demo images, image descriptions, and themed versions
GPII-140: Logo and electron font icons added to demo resource. Likely want to change logo though.
FLUID-4907: Changing to the version of Infusion in the FLUID-4907 branch.
GPII-150: Removed theme overrides for DT and replaced with class fl-inverted-color. Added low contrast themes
Merge remote-tracking branch 'michelle/FLUID-4907'

* michelle/FLUID-4907:
  FLUID-4907: Changing to the version of Infusion in the FLUID-4907 branch.
GPII-150: Tweak focus styling on prefs
Merge remote-tracking branch 'heidi/GPII-150'

* heidi/GPII-150:
  GPII-150: Tweak focus styling on prefs
  GPII-150: Removed theme overrides for DT and replaced with class fl-inverted-color. Added low contrast themes
GPII-148: Added padding to bottom of simplified content so it's not obscured by the DT panel bar
Merge branch 'master' into GPII-148
Merge remote-tracking branch 'heidi/GPII-148'

* heidi/GPII-148:
  GPII-148: Added padding to bottom of simplified content so it's not obscured by the DT panel bar
Merge branch 'master' of github.com:fluid-project/prefsEditors
FLUID-4907: updated to the latest version of Infusion. Includes a fix to a top level primary builder options.
Merge remote-tracking branch 'yura/FLUID-4907'

* yura/FLUID-4907:
  FLUID-4907: updated to the latest version of Infusion. Includes a fix to a top level primary builder options.
GPII-124: Changed label colour and added text shadow, to fix low contrast
Merge remote-tracking branch 'heidi/GPII-124'

* heidi/GPII-124:
  GPII-124: Changed label colour and added text shadow, to fix low contrast
GPII-140: Added modified version of the tree logo. Fixed contrast theme logos not changing properly.