Signed-off-by: Ghostcandywyj <ghost.wyj@gmail.com>
Merge branch 'master' of https://github.com/Demonsu/NjuVolunteer

Conflicts:
	public/tpls/templates_c/a7916e79428643b39e99c1493974ee1c008cebce.file.team_list.html.php

Signed-off-by: Ghostcandywyj <ghost.wyj@gmail.com>