fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	daily_report.py