fix bug while merging vcf's with samples
small useability improvement VCF importer
useablity improvement dataset merger
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/bartcharbon/molgenis

Conflicts:
	molgenis-data-elasticsearch/src/main/java/org/molgenis/data/elasticsearch/ElasticsearchDocumentNestedEntity.java