Upgraded to Django 1.7.
Adding Django vanilla views.
Helper runserver script. Because typing
Working on generic templates.
Getting templates loading.
Setup Django debug toolbar.
CHECKINAllTHETHINGS!
Merge branch 'generic'

Conflicts:
	main/main/settings.pyc