Merge branch 'master' of https://git.oschina.net/erawtfos/pycharm_zh_cn
Merge origin/master
Update CodeInsightBundle.properties
Merge branch 'master' of https://git.oschina.net/erawtfos/pycharm_zh_cn