merge
Merge branch 'master' of https://github.com/limingxu/JXT.git

Conflicts:
	jxt/src/com/jxt/action/admin/SchoolAction.java