Merge branch 'master' of https://github.com/fluid-project/prefsEditors into GPII-128

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