修复iframe的bug
Merge branch 'master' into editor