FLUID-4649: Ensure buttons enlarge with 'make inputs bigger'; height of control bar still doesn't enlarge
Merge branch 'master' into FLUID-4649

Conflicts:
	html/videoPlayer_template.html
FLUID-4870: Upgraded infusion.

Pulled a new snapshot from the latest code in the master of the Infusion repo (725fd98d6cc3ebbe92f378b8c05738b178dc6516). Also removed the dependency on Uploader and now just pulled in directly the modules that are needed (added: progress and jQueryScrollToPlugin).
Merge remote-tracking branch 'jobara/FLUID-4870'

* jobara/FLUID-4870:
  FLUID-4870: Upgraded infusion.
Merge remote-tracking branch 'anastasia/FLUID-4649'

* anastasia/FLUID-4649:
  FLUID-4649: Ensure buttons enlarge with 'make inputs bigger'; height of control bar still doesn't enlarge
Merge branch 'master' into FLUID-4804
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.
Merge branch 'master' into FLUID-4804