Merge pull request #6 from aarongao/master

jquery报错
resolve conflict of JSON and contextMenu
Merge remote-tracking branch 'alee/master'
Merge pull request #7 from aarongao/master

tiaoshi
可拖动窗口
实现窗口无边框
66
Merge remote-tracking branch 'alee/master'
close