Merge pull request #93 from dsteinich/master

PUBSTWO-939 - very rough first draft
PUBSTWO-939 - faceted search - more refined