merge with molgenis master branch
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 'master' of github.com:molgenis/molgenis
Renamed molgenis-omx-annotators to molgenis-annotators.
molgenis pom.xml now contains molgenis-annotators instead of imx-annotators.
removed the annotator option from the main menu bar.
Added annotators to the security config as authenticated.
removed omx-annotators as a dependency, and put data-annotators in its place.
removed omx-annotators from filepath
Added annotators as a module to the dataExplorer controller
Added a dataexplorer-annotators .js and .ftl file. Also added an icon for the annotators tab in the data explorer view.
Merge branch 'master' of github.com:molgenis/molgenis into test
Removed unused imports from data explorer controller
Merge pull request #1446 from erwinwinder/master

Fix test
Added molgenis-disease-matcher.
Added DiseaseMapping model.
Added DiseaseMappingProcessor for combining ALL/TYPICAL disease mapping files.
Merge pull request #1445 from Mark-de-Haan/test

Migrated annotator plugin to a dataexplorer module (like charts and aggregates)
- Disease matcher pull request improvements.