Signed-off-by: Aresxiao <xiaogeng91@foxmail.com>act_edit check
Signed-off-by: Aresxiao <xiaogeng91@foxmail.com>act_edit check and volunteer
profile modified check
Merge branch 'master' of https://github.com/Demonsu/NjuVolunteer

Conflicts:
	public/assets/js/zonev.js
	public/tpls/templates/act_apply.html
	sys/config/db-cred.inc.php

Signed-off-by: Aresxiao <xiaogeng91@foxmail.com>