Moved video captioning into the video component. #93
Added mp4 as a flash param. #93
Merge branch 'video-captions' into dev