Merge pull request #1109 from dennishendriksen/master

Forward port #2416 rename 'order' to 'submit'
Merge pull request #1112 from dennishendriksen/master

Fix #1111 Updating entity results in error
Forward port #2416 rename 'order' to 'submit'
Merge branch 'master' of https://github.com/molgenis/molgenis