update chyun
update sql
Merge branch 'master' of https://github.com/limingxu/jxt.git

Conflicts:
	jxt/src/com/jxt/service/SchoolService.java
	jxt/src/com/jxt/service/impl/SchoolServiceImpl.java

Change-Id: I4469058542ee87a9009419dc5023afb2158ac080
modify password generator