Merge pull request #299 from harmjanwestra/master

BugFixes
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
also test FDR
Clean up of test
fixed cis-test?
Merge branch 'master' of https://github.com/molgenis/systemsgenetics
updated files
Merge branch 'master' of https://github.com/Bonder-MJ/systemsgenetics
Ase improvements
Merge branch 'master' of github.com:molgenis/systemsgenetics
fixes tests
Merge branch 'master' of https://github.com/Bonder-MJ/systemsgenetics into test
Attempt to fix jenkins
Transtest fix
Merge pull request #300 from PatrickDeelen/master

ASE and test fix
Extended eQTL sorting
test clean up
Merge branch 'master' of https://github.com/molgenis/systemsgenetics

Conflicts:
	eqtl-mapping-pipeline/nb-configuration.xml
Merge branch 'master' of https://github.com/Bonder-MJ/systemsgenetics