-- enabled navbar-toggle
-- separated footers
-- set 'a project of internews' into image
-- moved login dropdown to right

-- removing hanging tabs
-- added easing to spinner and adjusted messages box to fit

Conflicts:
	django/website/dashboard/templates/dashboard/basic-text-widget.html
	django/website/local_settings.py.dev

Revert change to local_settings.py.dev regarding foreign key checks (mistakenly added with other styling changes)

Change from using an i tag for icons (which is what sb admin and bootstrap used to do) to using span tags for icons (which is more correct, and what bootstrap3 ended up doing as well)

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

Conflicts:
	django/website/transport/items.py

Escaping single quotes in json embed tag is actually un-necessary (and breaks the data) since the single quotes are replaced with html entities.

Remove untested djangojs url directive, which is not needed and does not work (mistakenly added following instructions)

InnoDb table and foreign key checks don't work well together in Django. See http://stackoverflow.com/questions/6178816/django-cannot-add-or-update-a-child-row-a-foreign-key-constraint-fails

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*