Fix the Entity edit didn't clean the context error.
Merge branch 'master' of https://github.com/mocha-platform/mocha