fix media
fix report
Merge branch 'trunk' of https://github.com/demonofshadow/ASAV into james
fix dashboard
Merge branch 'trunk' of https://github.com/demonofshadow/ASAV into james
Internal updated.