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

Conflicts:
	public/assets/js/indext.js
	public/tpls/templates/indext.html
	public/tpls/templates_c/7eb1dfe49ab8c6a3a0e890bd108136bf58dec260.file.indexv.html.php
	public/tpls/templates_c/fcc6fe68a9e41e4d9da946fded2039d0b9e628f0.file.indext.html.php

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