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

Conflicts:
	public/assets/js/zonev.js
	public/tpls/templates/act.html
	public/tpls/templates_c/99f4b94be72815d91c8e383d421150d80b9d5a7f.file.act_dtl.html.php
	public/tpls/templates_c/f953ae4134724fc8e1e51861dc90910c96308d5b.file.act.html.php
	public/tpls/templates_c/ff5701e6c2d16695a03a7c96a4c8dff10f58032e.file.act_dtl_left.html.php