MediaController updated.
random
Merge branch 'trunk' of https://github.com/demonofshadow/ASAV into jeffrey
Style fix.
Child Model updated.
Merge branch 'trunk' of https://github.com/demonofshadow/ASAV into jeffrey

Conflicts:
	Asav/protected/models/Child.php