Markers rock the house

(and fixed pie tests)
steps to pie charts
Merge remote-tracking branch 'refs/remotes/upstream/master' into barchart

Conflicts resolved:
	js/widgets.js