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
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
Remove doc generators (see model registry docs)
Fix pom error
Remove doc generators (see model registry docs)
Remove doc generators (see model registry docs)
Merge pull request #2191 from dennishendriksen/master

Remove doc generators (see model registry docs) + fix pom error
HTML and JS escaping in Freemarker templates
Move HTML escaped chars to freemarker