Tweak the way we render facet class labels w/messages and add tooltips. Fixes #370
Merge branch 'master' into virtual_collection_rework

Conflicts:
	modules/portal/conf/messages