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

Conflicts:
	Asav/protected/runtime/application.log
	Asav/protected/views/children/create.php
up
Children address fixed.
up to date child