preface /media/ to media resolver path
Show media example
Merge remote-tracking branch 'origin/master'