finish media view
Merge branch 'trunk' of https://github.com/demonofshadow/ASAV into jeffrey

Conflicts:
	Asav/protected/views/media/index.php
Merge branch 'trunk' of https://github.com/demonofshadow/ASAV into james

Conflicts:
	Asav/protected/views/media/view.php