Merge pull request #1 from RoanKanninga/master

test
Merge branch 'testing' of https://github.com/molgenis/systemsgenetics
Merge branch 'master' of https://github.com/molgenis/systemsgenetics.git
Merge branch 'master' of https://github.com/molgenis/systemsgenetics.git
Merge branch 'master' of https://github.com/molgenis/systemsgenetics.git
Merge branch 'master' of https://github.com/molgenis/systemsgenetics.git
- Initial version of TriTyperGenotypeData reader (untested)
Merge pull request #22 from harmjanwestra/master

Initial version of TriTyperGenotype Data
Fixes in ReadOnlyGeneticVariant. Starting with alleles=null had some errors
Additions to DoubleMatrixDataSet
Speed up of multithreaded correlation and addition of multithreaded covariation

Added tests for descriptives and correlation tasks
Merge pull request #24 from PatrickDeelen/master

Fixes in ReadOnlyGeneticVariant. Starting with alleles=null had some errors
Merge branch 'master' of https://github.com/molgenis/systemsgenetics
- Minor changes to TextFile, and a small bugfix in GWASCatalog
Merge pull request #25 from harmjanwestra/master

- Minor changes to TextFile, and a small bugfix in GWASCatalog
Merge branch 'master' of https://github.com/molgenis/systemsgenetics
Merge pull request #26 from Bonder-MJ/master

Additions to DoubleMatrixDataset, addition of mulitthreaded covariation calc, speed up of multithreaded correlation calculation
Merge branch 'master' of github.com:molgenis/systemsgenetics