Signed-off-by: Aresxiao <xiaogeng91@foxmail.com>
Merge branch 'master' of https://github.com/Demonsu/NjuVolunteer

Conflicts:
	public/tpls/templates_c/230cf9487e21db83bfe175beb267a8c56700c95a.file.infov_edit.html.php
	public/tpls/templates_c/44c556608e67759f0e68fc7fabee31d3f9c92847.file.zonev.html.php
	public/tpls/templates_c/5d4e8fdadac667c8dbd8810f1b75cc235d01ef23.file.infov.html.php
	public/tpls/templates_c/ca42c2d9adf86cfe0b6f0dde3518a36e842461f6.file.super_admin_add_team.html.php
	public/tpls/templates_c/d6a328254f3c3ea1ecde6f19f08837bf57cbb730.file.super_admin.html.php
	public/tpls/templates_c/e4023a7d129ac207d6c40b7af9464c30649c8619.file.act_time.html.php
	public/tpls/templates_c/e7b1c74051c7faa1a98def30a0cb77ffc342d845.file.super_admin_actinfo.html.php

Signed-off-by: Aresxiao <xiaogeng91@foxmail.com>