Merged in pull request and rebuilt cookie
Updated HISTORY for matrix, charts and graphics.
Merge remote-tracking branch 'upstream/master'
Fix issue with axis label placement. Fix #2532738
Charts build files.
Merge branch 'SV_autocalc_patch' into integration
Resolved conflict
Fixed issue where mousewheel events on a horizontally scrolling instance would prevent page scrolling (#2532739)
Build scrollview
Merge branch '3.x' into iotests
Converted IO tests
Dump garbage
Move to Shifter at explain YUI.add()
Moving IO tests around to test with grover and yogi
Updating tests for yogi/grover support
Merge branch 'live-docs'
Merge branch 'master' into 3.x

Conflicts:
	build/charts-base/charts-base-min.js
Merge branch '3.x' into iotests
Change to link to user guide
Merge branch 'master' into integration