增加社团初步
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