Signed-off-by: yeguangsuixing <411707420@qq.com>
Merge branch 'master' of https://github.com/Demonsu/NjuVolunteer

Conflicts:
	public/include/mem.php
	public/include/note_edit.php
	public/tpls/templates_c/065819e33f80626bdc30cb4be17a49ec08988f18.file.act_apply.html.php
	public/tpls/templates_c/1048da3ca248985a74c0290df8746b95cbab34f3.file.header.html.php
	public/tpls/templates_c/24f5947343209a91bb72f2be1d995a7847928238.file.actz.html.php
	public/tpls/templates_c/2ce719227b9ae7bc28317370bb4d6b205012cc85.file.note.html.php
	public/tpls/templates_c/44c556608e67759f0e68fc7fabee31d3f9c92847.file.zonev.html.php
	public/tpls/templates_c/53b9ffc70aa720e4a23eb563822ebf67326bba0c.file.infot.html.php
	public/tpls/templates_c/a7916e79428643b39e99c1493974ee1c008cebce.file.team_list.html.php
	public/tpls/templates_c/a82f01f400a1d4be5d0cf3f5fa9b1056671e35a8.file.index.html.php
	public/tpls/templates_c/ae501245acb6019fd59ecfaf5dc2aa117dc89e3a.file.zonet.html.php
	public/tpls/templates_c/b50b7562c6d0bda8d5967293bd62cebc8b3648b0.file.footer.html.php
	public/tpls/templates_c/bade9366763f2c3ef3f5c78c15ec9639ccea326d.file.login.html.php
	public/tpls/templates_c/d9589185483075bbc18652f970ece25b1222a8d2.file.mem.html.php
	public/tpls/templates_c/eeee522a0758d012a324ea3c3c98562ee4285189.file.news.html.php
	public/tpls/templates_c/f769ac5b08ee9b0df3433514abe1d10a24976d8d.file.actv_takein.html.php
	public/tpls/templates_c/f953ae4134724fc8e1e51861dc90910c96308d5b.file.act.html.php
	public/tpls/templates_c/faf877110be62a795340f534c0c692bc647f473c.file.rec_edit.html.php

Signed-off-by: yeguangsuixing <411707420@qq.com>