先sync一下
Merge branch 'master' of https://github.com/Louis-Ye/ZheNarWeb

Conflicts:
	ZheNar/events/views.py