Converted series chart from vows to jasmine
Merge pull request #414
boxPlot Transitions no tests but functional
Merge remote-tracking branch 'remotes/upstream/master' into umaster
boxPlot Transitions working. Issue with pixel perfect tests
disabled zoom during brushing
zoom changes

Conflicts:
	src/coordinate-grid-chart.js
bubbleChart: set opacity on circles during render instead of <g> element
further experimentation with zoom implementation
overhauled zoom-related behaviors to fix issues documented at https://github.com/NickQiZhu/dc.js/wiki/Zoom-Behaviors-Combined-with-Brush-and-Range-Chart
de-linted
reverted accidentally committed build artifacts
added note on zooming to brushing docs
Merge pull request #402
Merge pull request #418
Merge pull request #417
Fix the coloring issues in #417 and rebuild
Merge branch 'master' into wip-box-plot-fun

Conflicts:
	dc.js
	dc.min.js
	dc.min.js.map
	spec/box-plot-spec.js
	src/box-plot.js
	web/js/dc.js