uml
Model tags
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.ftl
Fix uml
Package tags
Merge branch 'master' of https://github.com/molgenis/molgenis
Remove unused dependency
reject files containing "-" in entity at import because of bug 2055
update pullrequest based on feedback comments
Fixed package update
Fix high priority Findbugs warnings
Fix high priority Findbugs warning
Fix high priority Findbugs warning (missing hashCode), Fix bug in equals
Fix high priority Findbugs warning
Fix #1992 Updating data explorer rows with nillable mref and no values results in error
Fix #2042 Using extends gives duplicate attributes in the standardsregistry tree view
Merge pull request #2057 from jjettenn/master

Data explorer improvements M2890
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #2067 from bartcharbon/master

reject files containing "-" in entity at import because of bug 2055
Merge pull request #2070 from dennishendriksen/master

Fix high priority Findbugs warnings + bug fixes