Fix test
Merge branch 'master' of https://github.com/Bonder-MJ/systemsgenetics
Merge pull request #302 from PatrickDeelen/master

Fix tests
Genetica Collections
ASE
eQTL mapping
Merge pull request #303 from PatrickDeelen/master

eQTL and ASE
Added special fdr
skipped first variance calc
added special fdr
Merge branch 'master' of https://github.com/molgenis/systemsgenetics

Conflicts:

	genetica-libraries/src/main/java/umcg/genetica/io/trityper/TriTyperExpressionData.java
Merge branch 'master' of https://github.com/Bonder-MJ/systemsgenetics