Xref/Mref search
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-omx-dataexplorer/src/main/resources/js/dataexplorer.js
xrefsearchfield for jpa and omx
Merge pull request #1220 from dennishendriksen/feature/genericdataexplorer

Fix filters/filter wizard in data explorer
Multiple search
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-omx-dataexplorer/src/main/resources/css/dataexplorer.css
	molgenis-omx-dataexplorer/src/main/resources/js/dataexplorer.js
	molgenis-omx-dataexplorer/src/main/resources/templates/view-dataexplorer.ftl
Fix merge
Merge pull request #1218 from erwinwinder/master

Xref/mref search filter
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/genericdataexplorer
cleanup