Merge branch 'feature/genericdataexplorer' of https://github.com/molgenis/molgenis into feature/genericdataexplorer
Fix molgenis-data-annotators build
Merge pull request #1164 from dennishendriksen/master

Fix molgenis-data-annotators build
Merge branch 'feature/genericdataexplorer' of https://github.com/molgenis/molgenis into feature/genericdataexplorer
generic data api for genome browser part I
Merge branch 'feature/genericdataexplorer' of https://github.com/molgenis/molgenis into feature/genericdataexplorer
Fix genome browser #2271
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/genericdataexplorer
Merge pull request #1171 from dennishendriksen/feature/genericdataexplorer

Fix genome browser #2271