修改了一些注释的乱码
Merge remote-tracking branch 'upstream/master'

Conflicts:
	demo_COC/activity/models.py