merge
reverted ontology merge
revert to molgenis master
revert to molgenis master
revert feature/ontology pull
Merge branch 'master' of github.com:Mark-de-Haan/molgenis
revert feature/ontology pull
revert feature/ontology pull
Merge branch 'master' of github.com:jjettenn/molgenis
Merge branch 'master' of github.com:molgenis/molgenis
Merge branch 'master' of github.com:molgenis/molgenis
Merge branch 'master' of github.com:molgenis/molgenis
Added model for the SAM format
Merge branch 'master' of github.com:molgenis/molgenis
Merge pull request #2039 from Mark-de-Haan/master

Added SAM model