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
Adding the ability to exclude the charts in the data-explorer
Merge branch 'master' of github.com:molgenis/molgenis
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
Adding the default value of including/excluding the charts in the
data-explorer.
Merge branch 'master' of github.com:molgenis/molgenis
Fixing typo
Merge pull request #1065 from jjettenn/master

Added include/exclude runtime property to the database populate implementation
changes for migrated compute
Merge pull request #1066 from georgebyelas/master

changes for migrated compute