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 branch 'master' into GPII-171

Conflicts:
	src/discoveryTool/css/DiscoveryTool.css
GPII-171: Chrome iframe vert scrollbar removed
Merge branch 'master' into GPII-171
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