Signed-off-by: Aresxiao <xiaogeng91@foxmail.com> modified act center week_actlist
Signed-off-by: Aresxiao <xiaogeng91@foxmail.com> modify weekactlist
Signed-off-by: Aresxiao <xiaogeng91@foxmail.com>
Merge branch 'master' of https://github.com/Demonsu/NjuVolunteer

Conflicts:
	public/tpls/templates_c/065819e33f80626bdc30cb4be17a49ec08988f18.file.act_apply.html.php
	public/tpls/templates_c/1048da3ca248985a74c0290df8746b95cbab34f3.file.header.html.php
	public/tpls/templates_c/44c556608e67759f0e68fc7fabee31d3f9c92847.file.zonev.html.php
	public/tpls/templates_c/7eb1dfe49ab8c6a3a0e890bd108136bf58dec260.file.indexv.html.php
	public/tpls/templates_c/98ac2491da6aa96dd5b95ddfd79f9643e04a48d2.file.act_handle.html.php
	public/tpls/templates_c/99f4b94be72815d91c8e383d421150d80b9d5a7f.file.act_dtl.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/eeee522a0758d012a324ea3c3c98562ee4285189.file.news.html.php
	public/tpls/templates_c/f953ae4134724fc8e1e51861dc90910c96308d5b.file.act.html.php
	public/tpls/templates_c/fcc6fe68a9e41e4d9da946fded2039d0b9e628f0.file.indext.html.php
	sys/config/db-cred.inc.php

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