Work in progress for diseasematcher
Merge branch 'master' of https://github.com/molgenis/molgenis
Added warnings when DiseaseMapping is not loaded or the current dataset does not comply with requirements
Added listing of phenotypes when disease is selected
Added listing of variants (from current dataset) associated with selected disease
Removed console.log
processed pull request comments + made everything async
now totally async
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.
update RTP genomebrowser and filter wizard
Merge pull request #1546 from bartcharbon/master

update RTP genomebrowser and filter wizard
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.
Show complex filter operator only when more then one input fields exist.
Hide complex filter operator when one input field exists.
Merge branch 'master' of github.com:molgenis/molgenis
Merge pull request #1549 from jjettenn/master

Complex filters: Show complex filter operator only when more then one input fields exist
Merge branch 'master' of https://github.com/molgenis/molgenis
bump version number v1.1.0-SNAPSHOT to v1.1.0
bump version number v1.1.0 to v1.2.0-SNAPSHOT
Add support for JSON-P
Merge pull request #1551 from dennishendriksen/master

REST API cross domain requests using JSON-P