use canvasjs.js substitute Chart.js
Merge branch 'master' of https://github.com/hulingfeng211/app1

Conflicts:
	Home/Tpl/Consume/index.html
	Home/Tpl/Consume/statistics.html