actually formatting for jsfiddle!
Merge branch 'master' of https://github.com/forio/contour

Conflicts:
	examples/showcase/column/column-grouped/demo.js
	examples/showcase/column/coumn-stacked/demo.js
	examples/showcase/line/line-sine/demo.js
	examples/showcase/pie/pie-gauge/demo.js
changes that came up during merge