Updated base template to include blocks for overriding sections of the template.
Merge branch 'master' of https://github.com/worthwhile/django_dash_2013

Conflicts:
	core/templates/base.html
Merge branch 'master' of https://github.com/worthwhile/django_dash_2013