Update Django dependency version
Use staticfiles directly

This also fixes django_toolbar, which in the latest version counts on staticfiles being enbled.
See: http://django-debug-toolbar.readthedocs.org/en/latest/installation.html#quick-setup
Merge branch 'use_staticfiles'

Conflicts:
	settings.py