report
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/controllers/dashboard.js
report-ju
Merge remote-tracking branch 'origin/master'

Conflicts:
	routes/report.js
报表优化完成-ju