1.1
Merge branch 'master' of https://github.com/306808700/WKeditor
Merge pull request #6 from kissygalleryteam/master

Merge pull request #5 from 306808700/master
Merge pull request #6 from 306808700/master

Auto merge by kpm server