Merge pull request #297 from Bonder-MJ/master

Additions to properly test the QTL mappint pipeline.
Merge pull request #298 from Bonder-MJ/master

real clean up after test
Fix Nullpointer exception when FDR type not set. Default is probe level.
Fix Nullpointer exception when FDR type not set. Default is probe level.
Fix meta-analyse interaction terms
Merge pull request #299 from harmjanwestra/master

BugFixes
Merge branch 'master' of https://github.com/molgenis/systemsgenetics
updated files
Merge branch 'master' of https://github.com/Bonder-MJ/systemsgenetics