Fix merging the merge result of a merge where at least one of the sets had x/mrefs
Merge branch 'master' of https://github.com/molgenis/molgenis
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
Layout and show entitiesdropdown
Merge pull request #2050 from jjettenn/master

DAS Model1.6 W.I.P Incl. enhanced error message
Merge pull request #2051 from jjettenn/master

DAS-MODEL 1.6
Changed a lot of string attributes to text attributes because the max column of mysql was reached
Refactor
Merge pull request #2049 from erwinwinder/master

Package search
Standard registry details layout + documentation
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-model-registry/src/main/resources/css/standardsregistry.css
	molgenis-model-registry/src/main/resources/js/standardsregistry.js
	molgenis-model-registry/src/main/resources/templates/view-standardsregistry_details.ftl
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-ontology/src/main/java/org/molgenis/ontology/OntologyConfiguration.java
Use select2 for entity dropdown, show all entities or package and subpackages
Merge pull request #2052 from dennishendriksen/master

Standard registry details layout + documentation + fixes
Merge branch 'master' of https://github.com/molgenis/molgenis
replaced - with _ to work around mysql table name problem if it contains a -
replaced - with _ to work around mysql table name problem if it contains a -
Merge remote-tracking branch 'origin/master'

Conflicts:
	molgenis-model-registry/src/test/resources/BioSample-Model.xlsx