FLUID-4844: Update Captionator and change our use of 'mode' to be spec compliant.
FLUID-4844: Modifying the way we set 'mode' so that captions work in Safari.
Merge remote-tracking branch 'michelle/FLUID-4844-b'

* michelle/FLUID-4844-b:
  FLUID-4844: Modifying the way we set 'mode' so that captions work in Safari.
  FLUID-4844: Update Captionator and change our use of 'mode' to be spec compliant.
FLUID-4663: First attempt at fullscreen including our controls.
FLUID-4663: Beginning to address full screen styling in Chrome.
FLUID-4663: Improved styling for fullscreen.
FLUID-4663: Tweaking the layout of fullscreen in webkit.
Merge remote-tracking branch 'michelle/FLUID-4663-v3'

* michelle/FLUID-4663-v3:
  FLUID-4663: Tweaking the layout of fullscreen in webkit.
  FLUID-4663: Improved styling for fullscreen.
  FLUID-4663: Beginning to address full screen styling in Chrome.
  FLUID-4663: First attempt at fullscreen including our controls.
Merge remote-tracking branch 'upstream/master' into FLUID-4826