Merge branch 'master' of https://github.com/contejo/core
edit content fixed
Merge branch 'master' of https://github.com/contejo/core