GPII-151: Updated to the master branch of infusion

Updated the instance of infusion to the latest version from the fluid-project/infusion repo's master branch.This includes the changes for FLUID-4907.
GPII-151: Modified to work with changes in master

Modified the way the options were set for pageEnhancer and UIO.
GPII-164: fixed focus issue

Fixed the issue where disabling one of the contrast presets made it lose focus. Now only calling refershView on the preset when it has been disabled by its counterpart preset.
Merge branch 'master' into GPII-151
Merge branch 'master' into GPII-164
Merge remote-tracking branch 'jobara/GPII-151'

* jobara/GPII-151:
  GPII-151: Modified to work with changes in master
  GPII-151: Updated to the master branch of infusion
Merge remote-tracking branch 'jobara/GPII-164'

* jobara/GPII-164:
  GPII-164: fixed focus issue
Merge branch 'master' into GPII-128

Conflicts:
	demos/discoveryTool/demo.js