FLUID-4649: Ensure buttons enlarge with 'make inputs bigger'; height of control bar still doesn't enlarge
FLUID-4804: Make sure volume button doesn't disappear in safari
Merge branch 'master' into FLUID-4649

Conflicts:
	html/videoPlayer_template.html
Merge branch 'master' into FLUID-4804
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
FLUID-4826: Slight refactoring of aira tests.

Modified the Video PLayer Aria tests to use the initVideoPLayer function from the testutils and switched from doing an assertTrue to assertValue when checking if the aria-controls attribute is added.
FLUID-4824: going-home commit: first steps for optional full-screen button and captions controls
FLUID-4826: updated the ToggleButton's onReady

Changed the onReady event of the toggleButton component to fire after the onAttach event of the tooltip and it's own onCreate event have fired.
FLUID-4826: Updated onReady for the languageMenu

Updated the onReady to fire after the onCreate and afterRender events have fired.
FLUID-4824: Fix to passing template url to MenuButton component
FLUID-4824: First working refactoring of controls to make captions and full-screen optional, added through demands.
FLUID-4824: Small fixes; fixes to some tests
FLUID-4824: Tests mostly passing (in FF)
FLUID-4824: Fix to template
FLUID-4824: Code clean-up
FLUID-4824: Move addListener into postInit, to better accommodate different timings in different browsers.
FLUID-4824: comment clean-up
Merge branch 'master' into FLUID-4804