Add Media type to support adding video and audio
Merge branch 'video-directive'