to merge
to merge
compute migration required changes
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
fix report row number, remove two run lan validation rules
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
Adding the ability to exclude the charts in the data-explorer
Merge branch 'master' of github.com:molgenis/molgenis
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
Merge pull request #1059 from jjettenn/master

Added the ability to exclude the charts in the data-explorer
fixed topmenu submenu comments
Fixing test!
Merge branch 'master' of github.com:molgenis/molgenis
Merge pull request #1064 from jjettenn/master

Fixing test
Merge pull request #1063 from RoanKanninga/master

fixed issue 1062