Expanded DiseaseMapping model with entity for OMIM morbidmap (disease names)
Preprocessing tool can now parse morbidmap files, both mappings are exported in a zip
Added tests
Changed OmimHPOAnnotator to not miss two small exceptions in morbidmap
Fixed bug of phenotypes showing up multiple times on diseases with more than one gene
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-disease-matcher/src/main/java/org/molgenis/diseasematcher/data/preprocess/DiseaseMappingProcessor.java
Merge branch 'master' of https://github.com/molgenis/molgenis

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'master' of https://github.com/molgenis/molgenis

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'master' of https://github.com/molgenis/molgenis
merge with master
Merge branch 'master' of https://github.com/molgenis/molgenis
OMX import gaf list from file.
Hey mark, alles goed?
Merge branch 'master' of https://github.com/molgenis/molgenis
Une commit pour le destractement de la Marque.
Une Commite pour le Marque Twee
Commit for pull from master.
Merge branch 'master' of https://github.com/molgenis/molgenis
temp
Commit for switch branch
Merge branch 'test'

Conflicts:
	molgenis-omx-dataexplorer/src/main/resources/templates/view-dataexplorer-mod-diseasematcher.ftl
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-omx-dataexplorer/src/main/resources/templates/view-dataexplorer.ftl
Fixed class=span9 annotation messing with the data explorer view