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

Conflicts:
	jxt/WebRoot/WEB-INF/template/admin/error.ftl
	jxt/WebRoot/WEB-INF/template/admin/school_input.ftl
	jxt/src/com/jxt/dao/impl/CityDaoImpl.java