All converted to media objects. I still need to add text.
Merge branch 'develop' into staging