Merge branch 'master' into branch1
完成group_avatar的改写,待测试
完成小组头像的上传
Merge branch 'master' into branch1
Merge branch 'branch1'
Merge branch 'master' into branch1
Merge branch 'branch1'
Merge branch 'master' into branch1
Merge branch 'branch1'
Merge branch 'master' into branch1
Merge branch 'branch1'
Merge branch 'master' into branch1
merge branch1
fix after merge branch1
some fix
Merge remote-tracking branch 'mutoulbj/master'

Conflicts:
	Bohoo/templates/index.html
	Bohoo/urls.py