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

Conflicts:
	public/assets/js/act_dtl.js

Signed-off-by: Ghostcandywyj <ghost.wyj@gmail.com>