Merge branch 'master' of git01.thoughtworks.com:sip-america-dashboard/tea

Conflicts:
	index.html
	lib/dc.js
	style.css