update report
Merge branch 'master' of github.com:zhigang2008/qrserver

Conflicts:
	dqs/views/report.html