Revert "Revert 19 media manager"
Merge pull request #21 from oat-sa/revert-20-revert-19-media-manager

Revert "Revert 19 media manager"