Barchart code
fixed donut
Merge branch 'master' of https://github.com/theguice/holiday-viz

Conflicts:
	_js/dashboard.js
resync
chart skeleton
minor
Minor
resync
fix index
Merge branch 'master' into shaun

Conflicts:
	_js/user-operations.js