Merge pull request #1 from Mark-de-Haan/test

Updates
Commit for merge from master.
*Extracted OmimService from OmimClientController.
*Added an ObjectPool to OmimService to rotate the OMIM API keys and prevent those keys being blocked (happens when exceeding the query limit of 4 times a second per key)
*Wrote tests for OmimClientController and OmimService (including PooledOmimKey)
*Changed icon to something better
*Local storage is temporarily cleared each time Diseae Matcher is loaded until its problems are fixed
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-core/src/main/java/org/molgenis/util/MySqlFileUtil.java
	molgenis-core/src/test/java/org/molgenis/util/MySqlFileUtilTest.java
	molgenis-core/src/test/resources/test_mysql_repo_util_query.sql
	molgenis-data-mysql/src/main/java/org/molgenis/data/importer/EmxImportServiceImpl.java
	molgenis-data-mysql/src/main/java/org/molgenis/data/mysql/MysqlRepository.java
	molgenis-data-mysql/src/test/java/org/molgenis/data/mysql/MysqlRepositoryCountTest.java
	molgenis-data-mysql/src/test/java/org/molgenis/data/mysql/MysqlRepositoryMrefTest.java
	molgenis-data-mysql/src/test/java/org/molgenis/data/mysql/MysqlRepositoryTest.java
	molgenis-data-mysql/src/test/java/org/molgenis/data/mysql/MysqlRepositoryXrefTest.java
	molgenis-omx-dataexplorer/src/main/resources/templates/view-dataexplorer.ftl
Merge branch 'master' of https://github.com/tommydeboer/molgenis

Conflicts:
	molgenis-omx-dataexplorer/src/main/resources/img/diseasematcher-icon.png
	molgenis-omx-dataexplorer/src/main/resources/templates/view-dataexplorer.ftl
reverted the unexplained changes for EmxImportServiceImpl.java
manually fixed the unexplained conflicts
removed unexplained col7a1 introduced related files
fixed the unexplained changes in the dataexplorer related templates due to unpleasant merging
fixed css not loading
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
updated elasticsearch version in the pom
Allow adding columns and data to existing mySQL repositories
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Formatting, add missing annotation, add unit tests
Dropdown instead of checkbox And/or complex filter, simple UX
Merge branch 'master' of https://github.com/mdijkstra/molgenis into feature/simplified_filter_UX_2649
Changing column name from "Barcode 2" to "Barcode 2 "