ddd
Merge branch 'jean's-branch'

Conflicts:
	accounts/models.py
	db.sqlite3