merge code for customer
Merge branch 'master' of github.com:kit-team/xuebao

Conflicts:
	src/cn/net/yto/vo/SignedLogVO.java