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
Fix test
Merge branch 'master' of https://github.com/Bonder-MJ/systemsgenetics