Monthly Report Updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	front/page/report.php