add v2.0 db script
Merge branch 'master' of https://github.com/limingxu/JXT.git
chyun
0730v2
sc
Add School Operator
update db script
Merge branch 'master' of https://github.com/limingxu/JXT.git

Conflicts:
	jxt/WebRoot/WEB-INF/template/admin/admin_input.ftl
	jxt/WebRoot/WEB-INF/template/admin/admin_list.ftl
	jxt/WebRoot/WEB-INF/template/admin/error.ftl
	jxt/WebRoot/WEB-INF/template/admin/menu_admin.ftl
	jxt/WebRoot/WEB-INF/template/admin/school_input.ftl
	jxt/WebRoot/template/admin/css/admin.css
	jxt/WebRoot/template/common/js/message_cn.js
	jxt/src/com/jxt/action/admin/AdminAction.java
	jxt/src/com/jxt/common/AdminType.java
	jxt/src/com/jxt/dao/DistrictDao.java
	jxt/src/com/jxt/dao/impl/CityDaoImpl.java
	jxt/src/com/jxt/dao/impl/DistrictDaoImpl.java
	jxt/src/com/jxt/dao/impl/GenericDaoImpl.java
	jxt/src/com/jxt/entity/Role.java
	jxt/src/com/jxt/listener/InitializableApplicationListener.java
	jxt/src/com/jxt/service/AdminService.java
	jxt/src/com/jxt/service/DistrictService.java
	jxt/src/com/jxt/service/SchoolService.java
	jxt/src/com/jxt/service/impl/AdminServiceImpl.java
	jxt/src/com/jxt/service/impl/SchoolServiceImpl.java
	jxt/src/com/jxt/util/DecryptUtil.java
Merge branch 'master' of https://github.com/limingxu/JXT.git

Conflicts:
	jxt/WebRoot/WEB-INF/template/admin/admin_input.ftl
	jxt/WebRoot/WEB-INF/template/admin/admin_list.ftl
	jxt/WebRoot/WEB-INF/template/admin/error.ftl
	jxt/WebRoot/WEB-INF/template/admin/menu_admin.ftl
	jxt/WebRoot/WEB-INF/template/admin/school_input.ftl
	jxt/WebRoot/template/admin/css/admin.css
	jxt/WebRoot/template/common/js/message_cn.js
	jxt/src/com/jxt/action/admin/AdminAction.java
	jxt/src/com/jxt/common/AdminType.java
	jxt/src/com/jxt/dao/DistrictDao.java
	jxt/src/com/jxt/dao/impl/CityDaoImpl.java
	jxt/src/com/jxt/dao/impl/DistrictDaoImpl.java
	jxt/src/com/jxt/dao/impl/GenericDaoImpl.java
	jxt/src/com/jxt/entity/Role.java
	jxt/src/com/jxt/listener/InitializableApplicationListener.java
	jxt/src/com/jxt/service/AdminService.java
	jxt/src/com/jxt/service/DistrictService.java
	jxt/src/com/jxt/service/SchoolService.java
	jxt/src/com/jxt/service/impl/AdminServiceImpl.java
	jxt/src/com/jxt/service/impl/SchoolServiceImpl.java
	jxt/src/com/jxt/util/DecryptUtil.java