Merge pull request #5 from longshenzhu/master

前端大概完成
头像尺寸问题解决
UI修改
Merge branch 'master' of https://github.com/longshenzhu/COC

Conflicts:
	demo_COC/media/img/corporation/1/logo.jpg
	demo_COC/media/img/corporation/2/logo.jpg
	demo_COC/media/img/group/1/logo.jpg
	demo_COC/media/img/group/2/logo.jpg
	demo_COC/media/img/group/3/logo.jpg
	demo_COC/media/img/student/1/face.jpg
	demo_COC/media/img/student/2/face.jpg
	demo_COC/media/img/student/3/face.jpg
	demo_COC/templates/group/group_manage_members.html
	demo_COC/templates/group/group_structure.html
Merge branch 'master' of https://github.com/lcya86/COC

Conflicts:
	demo_COC/media/img/group/5/logo.jpg