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

Conflicts:
	public/tpls/templates_c/1048da3ca248985a74c0290df8746b95cbab34f3.file.header.html.php
	public/tpls/templates_c/a82f01f400a1d4be5d0cf3f5fa9b1056671e35a8.file.index.html.php
	sys/config/db-cred.inc.php

Signed-off-by: Qunju <wyqqrince@gmail.com>
Signed-off-by: Qunju <wyqqrince@gmail.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/557724488c0d1472f55b9b370819058ffefc6297.file.notice.html.php
	public/tpls/templates_c/a7916e79428643b39e99c1493974ee1c008cebce.file.team_list.html.php
	sys/config/db-cred.inc.php

Signed-off-by: Qunju <wyqqrince@gmail.com>