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

Conflicts:
	django_development/sqlite3/SQLiteSpy.db3
	django_development/sqlite3/django.db3