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
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
added COUNT role
first steps towarding count permission
typo
set table width to 100%
return all entities instead of only jpa entities
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #1227 from RoanKanninga/master

first steps towarding count permission
dynamic role hierarchy
Fix test
Merge pull request #1228 from dennishendriksen/master

Return all entities instead of only jpa entities + small stuff
Merge pull request #1230 from erwinwinder/master

Fix test
Preselect xref/mref dropdowns.
Replace x,+ images
Merge branch 'master' of https://github.com/molgenis/molgenis