changed " to ' where able
Merge remote-tracking branch 'origin/master'

Conflicts:
	report.php