Fix merging the merge result of a merge where at least one of the sets had x/mrefs
Added a VCF model
Merge branch 'master' of github.com:molgenis/molgenis
Added a list of entity names to the package response of the standards registry controller
Expanded the handlebars JSON message with a list of entity names
Removed importer button, added drop down of entities to the package view. Selecting an entity and pressing the view in data explorer gives you the view for that entity
DAS-MODELv1.6 work in progress
Merge branch 'master' of github.com:molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Changed the '?dataset=' url for the data explorer to '?entity=' across molgenis
Merge branch 'master' of github.com:molgenis/molgenis
Changed getSimpleName to getLabel when asking emd for its name
Added bit of comment to the handlebar for loop. When no entities are available in a package, the drop down is disabled
Merge pull request #2047 from fdlk/master

merge feature/ontology to the master
Merge pull request #2044 from Mark-de-Haan/master

Added VCF model
Package search
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-model-registry/src/main/java/org/molgenis/standardsregistry/StandardsRegistryController.java
	molgenis-model-registry/src/main/resources/templates/view-standardsregistry.ftl
Fix merge
Merge branch 'master' of github.com:molgenis/molgenis
Layout and show entitiesdropdown