Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
erge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Fix counts for OmxRepository
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Fix Test
Fix missing AND
Aggregates on two columns
Merge branch 'master' of https://github.com/molgenis/molgenis
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
Removed tabix binary
Replaced tabix binary with TabixReader java class
New test file for CADD + tbi file
Removed tabix property and runtime process, now using TabixReader class.
Added picard dependency to the data-annotators pom.xml