Merge branch 'master' of https://github.com/molgenis/molgenis
File based factory
Merge branch 'master' of https://github.com/molgenis/molgenis
File based entity sources
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
Reverted some changes to make it compile
Merge pull request #820 from erwinwinder/master

Revert changes to make molgenis compile, data aoi changes