fix bug while merging vcf's with samples
small useability improvement VCF importer
useablity improvement dataset merger
Fix retrieving references of references of entities
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
Merge pull request #2 from dennishendriksen/master

Fix retrieving references of references of entities
fix bug in elastic search - setting of values
revert accidental commit
bugfix for adding data to elasticsearch
testdata for vcf importer and repository merger
Merge pull request #1964 from bartcharbon/master

Bugfixes for repository merger, ui improvements and testdata