extensions to SNPArray* and PEDMAP2VCF
Merge remote-tracking branch 'origin/master' into newSampleTreatment

Conflicts:
	pom.xml
	src/main/java/de/mpg/eva/genetics/athus/programs/PEDMAP2VCFConverter.java
	src/resources/changelog