fsaf
Merge branch 'master' of https://github.com/yd-org/dy-dealer.git

Conflicts:
	Xml2JavaCode/src/com/asiainfo/cboss/tool/StringUtil.java
sdfsd