Add facet matcher
Merge branch 'facet-matcher' into 1-0-beta

Conflicts:
	config/probe.yml