Fix merge conflict
Video player: class rather than id
Fix merge conflict
Merge pull request #683 from guardian/dom-context-7

Refactor video, gallery, & front bootstraps
Fix merge conflict