wip
wip
wip
wip
wip
wip
wip
wip
Merge branch 'master' of github.com:mar3/django.note

Conflicts:
	code.example/project.test1/db.sqlite3