changes
Merge branch 'master' of https://github.com/urbley/cr

Conflicts:
	Report.class.php