Omx 2 emx conversion and refactor
Merge branch 'master' of https://github.com/molgenis/molgenis into omx2emx-converter

Conflicts:
	molgenis-data-mysql/src/main/java/org/molgenis/data/mysql/MysqlRepository.java
	molgenis-data/src/main/java/org/molgenis/data/support/AbstractCrudRepository.java
Fix #1508 #1574 #1607 #1608 Use non-analyzed field for aggregation
Merge pull request #1616 from dennishendriksen/master

Fix #1508 #1574 #1607 #1608 Use non-analyzed field for aggregation
Fix #1606 Counts are not correct in the aggregate view
Test foiFix #1606 Counts are not correct in the aggregate view
Merge pull request #1617 from dennishendriksen/master

Fix #1606 Counts are not correct in the aggregate view
Fix test (did not take into account col sort order)
Merge pull request #1618 from dennishendriksen/master

Fix test (did not take into account col sort order)
Fix #1612 Entity description in dataexplorer
Merge pull request #1619 from dennishendriksen/master

Fix #1612 Entity description in dataexplorer
Sort tree preview same as loaded tree
Merge pull request #1620 from dennishendriksen/master

Sort tree preview same as loaded tree
Added an annotator example omx for annotators that are available out of the box.
Fix #1595 DecimalField Integer conversion
Merge pull request #1621 from Mark-de-Haan/master

Added an annotator example omx for annotators that are available out of ...
Merge pull request #1622 from dennishendriksen/master

Fix #1595 DecimalField Integer conversion
Conversion and refactor
Fix test: do not depend on fixed mref order
Merge pull request #1624 from dennishendriksen/master

Fix test: do not depend on fixed mref order