commit 2014-11-28
Merge branch 'master' of https://github.com/czd327917086/collect