update
update
upDATE
Merge branch 'trunk' of https://github.com/demonofshadow/ASAV into jeffrey

Conflicts:
	Asav/protected/models/Child.php
	Asav/protected/runtime/application.log
update