Merge branch 'master' of github.com:molgenis/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
Merge branch 'ClinicalVariants' of github.com:Mark-de-Haan/molgenis
Merge branch 'ClinicalVariants' of github.com:Mark-de-Haan/molgenis
Merge branch 'master' of github.com:molgenis/molgenis
Merge branch 'master' of github.com:joerivandervelde/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Working on cmdline runnable CADD annotator
Working on cmd line annotators
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Experimenting with annotators
Fixed merge conflicts
Added MolgenisSimpleSettings helper impl class
Fixed merge conflicts