Formatting
Fix test
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)
1. Made changes fixing undefined in filters.
2. The 'filter wizard' form-alignment is fixed.
3. Mref search results are better shown
Merge branch 'master' of github.com:molgenis/molgenis
- Disease matcher pull request improvements.
Merge pull request #1447 from tommydeboer/master

Added molgenis-disease-matcher module.
Token login
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-app-omx/src/main/resources/molgenis.properties
Merge pull request #1450 from jjettenn/master

Changes related to 2586
Merge pull request #1449 from erwinwinder/master

Api token login
Added JpaStandaloneDataService
Merge pull request #1454 from erwinwinder/master

Added JpaStandaloneDataService