fix 2.4 collection types
fix 3.9,resolve 2.4 conflict
Merge pull request #184 from stanzhai/develop

【校对】删除.DS_Store，添加.gitignore，解决2.4节冲突，标准化3.9文档