locale change
delete class
delete class
Merge branch 'master' of https://github.com/guoyang/EntertainmentServer

solve confilict
Conflicts:
	web/WEB-INF/classes/util/CloseUtil.class
	web/WEB-INF/classes/util/StringUtil.class
	web/WEB-INF/classes/util/TextContent.class