统计
Merge branch 'qiyu'

Conflicts:
	WebContent/html/statistics/contribution.html