Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/erwinwinder/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/indexingrepo
Merge branch 'master' of https://github.com/molgenis/molgenis
Replace our BulkProcessor with blocking BulkProcessor to be introduced in ES1.4.0
Small doc fix
Remove deprecated note
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/indexingrepo
Disable another test (I'm ashamed having to write this!)
Merge pull request #1866 from dennishendriksen/feature/indexingrepo

Replace our BulkProcessor with blocking BulkProcessor from ES1.4.0
Fix exception in case of no aggregate results
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/indexingrepo
Merge pull request #1867 from dennishendriksen/feature/indexingrepo

Fix exception in case of no aggregate results
Fix And/Or xrefmrefsearch layout
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/indexingrepo
Merge pull request #1868 from bartcharbon/master

fix "undefined" in case of mref search values
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