111
Merge branch 'master' of https://github.com/lcya86/COC
after merge
before merge
Merge remote-tracking branch 'upstream/master'

Conflicts:
	demo_COC/accounts/models.py
	demo_COC/templates/accounts/broadcast.html
	demo_COC/templates/accounts/people_group.html
	demo_COC/templates/group/group.html
	demo_COC/templates/group/group_manage_members.html
前端大改动
Merge branch 'master' of https://github.com/lcya86/COC

Conflicts:
	demo_COC/corporation/forms.py
	demo_COC/media/img/group/2/logo.jpg
	demo_COC/media/img/student/1/face.jpg
	demo_COC/static/css/bootstrap.min.css
	demo_COC/templates/accounts/broadcast.html
	demo_COC/templates/accounts/people_corporation.html
	demo_COC/templates/accounts/people_feeds.html
	demo_COC/templates/accounts/people_group.html
	demo_COC/templates/group/group.html
	demo_COC/templates/group/group_manage_members.html
	demo_COC/templates/group/my_groups.html
after commit
Merge pull request #5 from longshenzhu/master

前端大概完成