GPII-128: changes based on code review

1. Added/updated comments
2. changed presetComponents -> presetPanels
3. removed defaulting the numSelections to 0 in the call to Math.min
Merge branch 'master' into GPII-128

Conflicts:
	demos/discoveryTool/demo.js
GPII-167: Merged in master and gpii-128, fixed options update