Merge pull request !325 from 疯狂的狮子Li/master
Merge pull request !322 from muyi/master
Merge pull request !321 from 疯狂的狮子Li/N/A
Merge pull request !318 from 稚屿/N/A
Merge pull request !316 from 马小法/master
Merge pull request !312 from 稚屿/master
Merge pull request !309 from 稚屿/master
Merge pull request !308 from xiaoshitou/N/A
Merge pull request !304 from 马小法/master
