Working on tests for binary plink format reader
Merge branch 'master' of github.com:molgenis/molgenis-genotype-reader
Merge pull request #26 from PatrickDeelen/master

Small refactor genotypeData and merge erwin
Merge with Erwin and Patrick
Small fix: wrong variable in unknown sequence check
Working on Plink binary reader
Merge pull request #27 from PatrickDeelen/master

Completed modifiable genotype data
Working on plink binary reader, implemented fresh function to get all SNPs for an individual
Merge branch 'master' of github.com:molgenis/molgenis-genotype-reader
Merge pull request #28 from PatrickDeelen/master

Diverse updates some bug fixes
Merge branch 'master' of github.com:molgenis/molgenis-genotype-reader
Merge with Patrick, fixed compilation
Finished plink binary reader (the existing test for PedMap passes for BedBimFam)
Cleanup of code
Factored out some unnecessary code
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
Added Impute2GenotypeWriter