FLUID-4701: Minor code tidy up.
FLUID-4701: Adding the callback parameter that was accidentally removed back to the Amara url.
FLUID-4795: Upgrade captionator to version that is more in line with spec, update VideoPlayer to new API.
Merge remote-tracking branch 'michelled/FLUID-4701' into FLUID-4795

Conflicts:
	js/VideoPlayer_html5Captionator.js
Merge branch 'demo' into FLUID-4795

Conflicts:
	js/VideoPlayer.js
	js/VideoPlayer_html5Captionator.js
FLUID-4818: Replacing 'buffered' in the model which was an object that can not be safely passed around, with 'bufferEnd' which is a simple property.
FLUID-4813: Added theming for the volume slider.
FLUID-4829: Fixed width and position of volume slider to align with volume button
FLUID-4829: Fixed width and position of volume slider to align with volume button
FLUID-4825: replaced shadow on controls with border for themes. Removed temporary css for initial overlay no longer needed.
Merge remote-tracking branch 'michelled/FLUID-4818'

* michelled/FLUID-4818:
  FLUID-4818: Replacing 'buffered' in the model which was an object that can not be safely passed around, with 'bufferEnd' which is a simple property.
FLUID-4819: explicitly setting video width to be same width as overlay
Merge branch 'master' into FLUID-4795

Conflicts:
	js/VideoPlayer_html5Captionator.js
	tests/html/TestCaptions.en.vtt
	tests/js/VideoPlayerHTML5CaptionatorTests.js
FLUID-4795: Upgrade Captionator, to make captions work in Safari.
FLUID-4795: Bring captionator tests up to latest changes
FLUID-4835: Update processing of Amara timecodes to reflect switch to milliseconds.
FLUID-4835: Linting
Merge branch 'FLUID-4835'

* FLUID-4835:
  FLUID-4835: Linting
  FLUID-4835: Update processing of Amara timecodes to reflect switch to milliseconds.
Merge remote-tracking branch 'heidiv/FLUID-4819'

* heidiv/FLUID-4819:
  FLUID-4819: explicitly setting video width to be same width as overlay
FLUID-4835: Fix to timecodes for clickable transcripts, with test.