Fix NullPointerException. Modified ResultCollapsedChildFactory.createKeys() to loop through the flattened file set as it did in previous versions (which fixes current null bugs), but still use the new approach of calling getSnippet().
Revert keyword list panel icon to the watch icon.
Merge pull request #553 from SynapticNulship/searchoptions

null ptr fix