Referenced media in the manifest.
Merge branch 'master' into feature/140-activities