other bugs fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	cache/reports.json
other bugs fix
Merge remote-tracking branch 'origin/master'