ending messages ChildMessage
update report
fix bug
up
Merge branch 'trunk' of https://github.com/demonofshadow/ASAV into james

Conflicts:
	Asav/protected/models/Media.php