Merge branch 'master' of https://github.com/PatrickDeelen/systemsgenetics
Updates to NoLdSnpProbeListCreator
Merge branch 'master' of https://github.com/molgenis/systemsgenetics
xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	eqtl-mapping-pipeline/nb-configuration.xml
Option to chose which FDR method you need

Handy for calculation on slower discs, when not all fdr options are
necessary dircetly.
Copy paste is evil
Merge branch 'master' of https://github.com/molgenis/systemsgenetics
Merge pull request #294 from Bonder-MJ/master

FDR options and small stuff