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

Conflicts:
	sys/config/db-cred.inc.php

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