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

Conflicts:
	jxt/WebRoot/WEB-INF/template/admin/class_input.ftl
	jxt/WebRoot/WEB-INF/template/admin/menu_admin.ftl