Merge pull request #1557 from dennishendriksen/master

REST API cross-origin resource sharing
Merge branch 'master' of https://github.com/molgenis/molgenis