Ase improvements
Merge branch 'master' of github.com:molgenis/systemsgenetics
Merge branch 'master' of https://github.com/Bonder-MJ/systemsgenetics into test
Attempt to fix jenkins
Merge pull request #300 from PatrickDeelen/master

ASE and test fix
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