Added new DataSet datasources, DataAPI and elasticsearch versions + refactoring
fixed merge error
updated for new das sources
update mydasconfig for dataexplorer integration of dalliance
updated app-omx for genomebrowser in data explorer
Merge pull request #1055 from dennishendriksen/master

Fix report row number, remove two run lan validation rules
moved gids scripts to another package + made small script for Palga
removed BenchmarkApp
rename to fix casing
rename to fix casing
Adding the ability to exclude the charts in the data-explorer
Merge branch 'master' of github.com:molgenis/molgenis
updates after code review
update after code review
Merge pull request #1057 from bartcharbon/master

New DAS en Dalliance + integrated Dalliance in Data Explorer
Merge pull request #1058 from RoanKanninga/master

moved gids scripts to another package + made small script for Palga
Merge branch 'master' of github.com:molgenis/molgenis

Conflicts:
	molgenis-omx-dataexplorer/src/main/resources/templates/view-dataexplorer.ftl
merged biobankconnect release.1.0 with molgenis master
Merge branch 'master' of github.com:molgenis/molgenis into ClinicalVariants
Merge pull request #1059 from jjettenn/master

Added the ability to exclude the charts in the data-explorer