统计趋势图
Merge branch 'qiyu'

Conflicts:
	WebContent/view/statistics/composition.jsp
	WebContent/view/statistics/contribution.jsp