bug修复
Merge branch 'master' of https://github.com/bigzhu/shuqian

Conflicts:
	collections/statistical.coffee
Merge branch 'master' of https://github.com/bigzhu/shuqian
Merge branch 'master' of https://github.com/bigzhu/shuqian