GPII-157: Added simplify styling for the default theme. Todo: contrast themes, and test at lower resolutions.
GPII-157: Added media queries to make the content adjust properly at lower client width.
GPII-157: Removed fl-simplify from the markup. Will be applied to the body element by the enactor.
GPII-171: Preferences scroll instead of wrap when screen is narrow
GPII-171: CSS clean up
GPII-171: CSS clean up
Merge branch 'master' into GPII-171
Merge remote-tracking branch 'jhung/GPII-157' into GPII-165
GPII-165: Apply simplify css class to uiEnhancer container when the simplify preference is turned on. Remove it when the simplify preference is turned off.
GPII-165: Created separate apply and reset functions for the on/off of simplified content.
GPII-165: Make simplify enactor component more declaratively.
Merge branch 'master' into GPII-165

Conflicts:
	demos/discoveryTool/index.html
Merge branch 'master' into GPII-171

Conflicts:
	src/discoveryTool/css/DiscoveryTool.css
Merge branch 'master' into GPII-165

Conflicts:
	src/discoveryTool/js/DiscoveryTool.js
GPII-165: Make the simplify enactor more declarative as well as jslinting.
GPII-171: Chrome iframe vert scrollbar removed
Merge branch 'master' into GPII-171
Merge branch 'master' into GPII-165 and resolve the conflict.

Conflicts:
	src/discoveryTool/js/DiscoveryTool.js
Merge remote-tracking branch 'cindy/GPII-165'

* cindy/GPII-165:
  GPII-165: Make the simplify enactor more declarative as well as jslinting.
  GPII-165: Make simplify enactor component more declaratively.
  GPII-165: Created separate apply and reset functions for the on/off of simplified content.
  GPII-165: Apply simplify css class to uiEnhancer container when the simplify preference is turned on. Remove it when the simplify preference is turned off.
  GPII-157: Removed fl-simplify from the markup. Will be applied to the body element by the enactor.
  GPII-157: Added media queries to make the content adjust properly at lower client width.
  GPII-157: Added simplify styling for the default theme. Todo: contrast themes, and test at lower resolutions.
Merge remote-tracking branch 'heidi/GPII-171'

* heidi/GPII-171:
  GPII-171: Chrome iframe vert scrollbar removed
  GPII-171: CSS clean up
  GPII-171: CSS clean up
  GPII-171: Preferences scroll instead of wrap when screen is narrow