django problem
Merge branch 'master' of https://github.com/stefanmonkey/stefanbo
Merge branch 'master' of https://github.com/stefanmonkey/stefanbo
Merge branch 'master' of https://github.com/stefanmonkey/stefanbo

Conflicts:
	development/django_development/django_mysite/django_mysite/settings.py