security bugfix
Merge branch 'trunk' of https://github.com/demonofshadow/ASAV into michael
Merge branch 'trunk' of https://github.com/demonofshadow/ASAV into james

Conflicts:
	Asav/protected/controllers/ReportController.php