...
Merge branch 'master' of https://github.com/qitang/myeditor
Qi stuff
fixed conflicts