Added video playback view
added video playback view
resolve conflicts
fix conflicts
fixed orientation bug on facedown/faceup
fix conflicts
description -> caption
Merge branch 'master' into camera