-- changing icon on basic-text-widget
-- adding active state bg-color to sidebar

Conflicts:
	django/website/transport/items.py

I think this should really use ItemSerializer

Tidy up transport delete items

Make the url generation work proerly (though I'm fairly sure we don't
actually need the url as an argument to delete) and remove
debug print statement *blush*

Previously were strings - django tables2 requires datetime objects

Make bulk_delete use delete() instead of bulk delete from REST

Implement the chart widget, and include the flot library. Data is communicated from Django to the javascript code using html5 data attributes, emembed using a Django custom filter.

Conflicts:
	django/website/dashboard/templates/dashboard/dashboard.html

Conflicts:
	django/website/hid/templates/hid/dashboard.html

Conflicts:
	django/website/urls.py

Conflicts:
	django/website/dashboard/tests/widget_tests.py

Conflicts:
	django/website/dashboard/static/dashboard/dashboard.css

Add bootstrap markup to the simple text widget, and add the basic dashboard css. This should be updated when we merge in the theme.

Add bootstrap markup to the simple text widget, and add the basic dashboard css. This should be updated when we merge in the theme.