Merge remote-tracking branch 'fluid-project/master'

* fluid-project/master:
  GPII-158: Pass elements and model value to simplfy enactor set() method.
  GPII-158: Modify simplify enactor to use a selector of elements to hide, rather than duplicating the article element; add selector to necessary elements in demo content
  GPII-140: Fixed the tab text overlapping the content area when enlarged. Next and Previous button arrows now centred properly when enlarged and using contrast themes.
  GPII-140: Changed the Atom logo to include the outer circle.
  GPII-140: master merged in, heading tweak
  GPII-140: Added modified version of the tree logo. Fixed contrast theme logos not changing properly.
  GPII-124: Changed label colour and added text shadow, to fix low contrast
  FLUID-4907: updated to the latest version of Infusion. Includes a fix to a top level primary builder options.
  GPII-148: Added padding to bottom of simplified content so it's not obscured by the DT panel bar
  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
  FLUID-4907: Changing to the version of Infusion in the FLUID-4907 branch.
  GPII-140: Logo and electron font icons added to demo resource. Likely want to change logo though.
  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
Merge remote-tracking branch 'fluid-project/master'

* fluid-project/master: (98 commits)
  GPII-163: Adjusted the document order of the DT
  GPII-168: Typo fix
  GPII-168: Typo fix
  GPII-168: Set expanded val to model value on create
  GPII-168: Added aria-expanded to be set on create
  GPII-168: Added aria to DT button and panel
  GPII-183: Added a readme for buzz
  GPII-183: Fixed a type-o
  GPII-183: Removes tts when not supported
  GPII-183: Updated tts enactor to use buzz
  GPII-183: Adding the buzz audio framework
  GPII-127: De-linting
  GPII-162: Reworked focus on prefs for themes
  GPII-162: Reworked focus on prefs for themes
  GPII-176: Fixed an issue where orbital images were too small when using a non-default theme.
  GPII-127: Clean up styling of more-text in banner logo
  GPII-127: Exclude some small icons from more-text
  GPII-127: Styling improvements to more-text display
  GPII-127: Clean up use of markup template, improve naming
  GPII-176: Removed inline style for Orbitals diagram width. This should cause the diagrams to wrap at the edge of the page.
  ...
FLUID-5131: Updating the Infusion version
FLUID-5131: Updated the exploration tool

Updated the exploration tool to use the latest version of infusion
FLUID-5131: finished renaming

renamed remaining instances of uio and uiOptions
FLUID-5131: removed console.log
Merge branch 'FLUID-5131'

* FLUID-5131:
  FLUID-5131: removed console.log
  FLUID-5131: finished renaming
  FLUID-5131: Updated the exploration tool
  FLUID-5131: Updating the Infusion version
Merge remote-tracking branch 'fluid-project/master'

* fluid-project/master: (41 commits)
  FLUID-5131: removed console.log
  FLUID-5131: finished renaming
  FLUID-5131: Updated the exploration tool
  FLUID-5131: Updating the Infusion version
  GPII-193: Fixed a problem with the invoker being declared outside of the slidingPanel.
  GPII-208: RobotoSlab font now being applied properly to Discovery Tool.
  GPII-195: Fixed the markup so that checkmark transition does not shift the text label.
  GPII-193: Added preventDefault for the sliding panel toggle button.
  GPII-204: Increased the margin so the more text icons do not overlap with content text when contrast themes are enabled.
  GPII-193: - fixed tabs to spaces - removed old javascript from a previous attempt to fix this issue. - removed underline hover style for panelbar link
  GPII-193: Added keyboard focusing styling for contrast modes.
  GPII-222: Changed the name of the label selector to be more consistent with established pattern. Fixed naming of toggle selector.
  GPII-185: Exploration tool uses the cookie store by default.
  GPII-222: Removed hard-coded strings from templates and added them to the message bundle.
  GPII-221: Renamed references to 'DiscoveryTool' to 'ExplorationTool' within the markup and scripts.
  GPII-221: Renamed references from within markup and scripts from 'DiscoveryTool' to 'ExplorationTool'.
  GPII-221: Renamed files within the src directory from 'DiscoveryTool' to 'ExplorationTool'
  GPII-221: Renamed parent directories from 'DiscoveryTool' to 'ExplorationTool'.
  GPII-185: Completed a comment.
  GPII-185: Clean up the code for sending a pull request for the GPII settings store.
  ...
Merge branch 'master' into GPII-153_GPII-187

Conflicts:
	src/shared/lib/infusion/MyInfusion.js
	src/shared/lib/infusion/README.md
	src/shared/lib/infusion/framework/preferences/messages/contrast.json
	src/shared/lib/infusion/framework/preferences/messages/textFont.json