fix bug in AdminModel
Merge branch 'master' of github.com:Allen-yan/Miao

Conflicts:
	apps/volunteer/admin.py