Fix And/Or xrefmrefsearch layout
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/indexingrepo
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/indexingrepo

Conflicts:
	molgenis-omx-dataexplorer/src/main/resources/js/dataexplorer-filter.js
Fix no results message for aggregates
Merge pull request #1869 from dennishendriksen/feature/indexingrepo

Fix And/Or xrefmrefsearch layout + no results message for aggregates