order by guanjunding
Merge branch 'master' of https://github.com/django-blog-group/group-test

Conflicts:
	test