Merge pull request binarywang#87 from wechat-group/develop

准备发布新版本2.4.0

Merge branch 'develop'

# Conflicts:
#	README.md

Merge branch 'develop'

# Conflicts:
#	README.md

Merge pull request binarywang#30 from wechat-group/develop

merge Develop

Merge branch 'develop'

升级1.3.5版本

update