Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Validation
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
do not update the shoppingcart on init of the catalog page (#1040)
Merge pull request #1133 from bartcharbon/master

do not update the shoppingcart on init of the catalog page (#1040)
fixed the bug of elasticsearch that everything is retrieved from the index
Merge pull request #1135 from ChaoPang/master

fixed the bug of elasticsearch that everything is retrieved from the index
Merge branch 'master' of https://github.com/molgenis/molgenis
Make OmxRepository writable.
Moved code from importer to OmxRepository
Validation
Remove code
Merge pull request #1137 from erwinwinder/master

Made OmxRepository writable, first validaton commit
fixed the test of elasticsearch
Merge pull request #1138 from ChaoPang/master

fixed the test of elasticsearch
remove <property name=eclipselink.persistence-context.flush-mode value=commit/> from PersistenceGen.xml.ftl
Merge pull request #1140 from ChaoPang/master

remove <property name="eclipselink.persistence-context.flush-mode" value="commit"/> from PersistenceGen.xml.ftl