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

Conflicts:
	Asav/protected/runtime/application.log
	Asav/protected/views/children/_form.php
update Reporttypes.php