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

Conflicts:
	public/handle/login.php
	public/index.php
	public/tpls/templates_c/ae501245acb6019fd59ecfaf5dc2aa117dc89e3a.file.zonet.html.php
	public/tpls/templates_c/eeee522a0758d012a324ea3c3c98562ee4285189.file.news.html.php

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