Merge pull request #333 from Bonder-MJ/master

Relocation and feature addition
GH
Fix merge  conflict
Extra sample filter test
Fixed bug plus test writing trityper and using sample filter in alignment
Merge pull request #334 from PatrickDeelen/master

Bug fixes / imporvements GH
Removed some debug code from GH
Merge pull request #335 from PatrickDeelen/master

Removed some debug code from GH
Merge branch 'master' of https://github.com/molgenis/systemsgenetics