Added phasing
Merge branch 'master' of https://github.com/molgenis/molgenis-genotype-reader

Conflicts:
	src/main/java/org/molgenis/genotype/impute2/HapsEntrySampleVariantsProvider.java
	src/main/java/org/molgenis/genotype/plink/PedMapGenotypeData.java
	src/main/java/org/molgenis/genotype/variant/CachedSampleVariantProvider.java
	src/main/java/org/molgenis/genotype/variant/SwappingSampleVariantsProvider.java
	src/main/java/org/molgenis/genotype/vcf/VcfGenotypeData.java
	src/test/java/org/molgenis/genotype/DummySampleVariantsProvider.java
	src/test/java/org/molgenis/genotype/plink/PedMapGenotypeDataTest.java
	src/test/java/org/molgenis/genotype/tabix/TabixQueryTest.java
	src/test/java/org/molgenis/genotype/vcf/VcfVariantLineMapperTest.java
Fix merge errors
Merge pull request #30 from erwinwinder/master

Added phasing