修改字词错误
Merge pull request #31 from yangsibai/patch-1

修改字词错误
在_test中的baseStyle.js中添加两个测试用例
_test basestyle.js 增加两个测试用例
Merge pull request #32 from worry127722/master

在_test中的baseStyle.js中添加两个测试用例
Merge pull request #1 from fex-team/master

合并原作者更新
增加 7个测试用例：trace:#3869,#3873,#3880,#3881,#3886,#3941,#3878,  plugins/map.js  和  plugins/basestyle.js
完善测试用例
完善
Merge pull request #2 from fex-team/dev

Dev
Delete encodings.xml
Delete misc.xml
Delete modules.xml
Delete umeditor.iml
Delete vcs.xml
Delete README.md
1
Merge branch 'dev' of https://github.com/worry127722/umeditor into dev
Create README.md
Update README.md