Hackaton result
Hackaton result
Merge branch 'master' of https://github.com/molgenis/molgenis into hackaton

Conflicts:
	molgenis-data-rest/src/test/java/org/molgenis/data/rest/RestControllerTest.java
Merge branch 'master' of https://github.com/molgenis/molgenis into hackaton

Conflicts:
	molgenis-data-rest/src/test/java/org/molgenis/data/rest/RestControllerTest.java
cleaning up pull request
cleaning up pull request
cleaning up pull request after review comments
Merge pull request #1343 from bartcharbon/hackaton

new genome browser (standard Dalliance without custom code)
remove genomebrowser module, move gb files to data-explorer
Merge pull request #1345 from bartcharbon/hackaton

remove genomebrowser module, move gb files to data-explorer
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-omx-dataexplorer/src/main/resources/js/dataexplorer-data.js