Merge branch 'master' into GPII-128

Conflicts:
	src/discoveryTool/css/DiscoveryTool.css
Merge remote-tracking branch 'heidi/GPII-128' into GPII-128
Merge remote-tracking branch 'heidi/GPII-128' into GPII-128
Merge remote-tracking branch 'heidi/GPII-128' into GPII-128
GPII-128: cycling hover preview

Implemented the the cycling hover of the presets on hover and focus of the "try something new" button
GPII-128: Moved try something new config

Moved the configuration for try something new into the gpii.discoveryTools.panels grade.
GPII-128: Hover style for icons added, for try something new