sort
Merge remote-tracking branch 'origin/Lixu-11.1' into gaoce-11-1

Conflicts:
	ourplatform/views.py