修改柱形，饼图，折线图，条形图功能

Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/controllers/dashboard.js
	public/partials/dashboard.html
	views/index.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/controllers/analysis.js
	public/js/controllers/dashboard.js
	routes/report.js
	routes/routes.js