Merge branch 'develop'

Merge pull request binarywang#391 from Wechat-Group/develop

合并 Develop

Update readme.md

Merge branch 'develop'

Merge pull request binarywang#184 from Wechat-Group/develop

合并Develop，准备发布2.6.0版本

Merge pull request binarywang#138 from Wechat-Group/develop

merge Develop branch

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