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

Conflicts:
	django_development/mysite/settings.py
	django_development/sqlite3/django.db3