Fix counts for OmxRepository
Fix Test
Fix missing AND
Aggregates on two columns
Merge branch 'master' of https://github.com/molgenis/molgenis
Aggregates on two columns
Fix row counts
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-omx-dataexplorer/src/main/java/org/molgenis/dataexplorer/controller/DataExplorerController.java
	molgenis-omx-dataexplorer/src/main/resources/js/dataexplorer-aggregates.js
	molgenis-omx-dataexplorer/src/main/resources/js/dataexplorer.js
	molgenis-omx-dataexplorer/src/main/resources/templates/view-dataexplorer.ftl
Fix merge
fix merge
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Revert some code to make it work again
Merge branch 'master' of https://github.com/molgenis/molgenis
Fix merge
Remove merge artifacts
Merge branch 'master' of https://github.com/molgenis/molgenis
Fix metadata check
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-omx-dataexplorer/src/main/resources/js/dataexplorer-aggregates.js
Fix merge