use username for the sort order
Merge branch 'solution'

Conflicts:
	models.py