Merge branch 'master' of https://github.com/molgenis/molgenis
correct typo
Move action button to dataexplorer top, datasetselect to descriptionpanel
merge master
code formatting
revert css change, does not look okey if dataset select is not shown
Bug fix: Static content 'Edit page' escapes HTML #2027
Merge branch 'master' of github.com:molgenis/molgenis
Fix bug: runtime properties cannot be updated
D3.2 report on models and mappings registry related to story #2856
some fixes
Merge pull request #2180 from jjettenn/master

Bugfixs: Runtime property update fix and escaping issues fix
fix CaddAnnotator only processing first line of response
Merge remote-tracking branch 'origin/master'

Conflicts:
	molgenis-data-annotators/src/main/java/org/molgenis/data/annotation/impl/CaddServiceAnnotator.java
revert
revert
break loop when hit is found
Merge pull request #2183 from bartcharbon/master

fix CaddAnnotator only processing first line of response
expression evaluators
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/computedAttributes