commit local
commit local
Merge branch 'master' of https://github.com/changding/erbao

Conflicts:
	converter/.classpath
	converter/pom.xml
	converter/src/main/java/org/search/bean/converter/ConvertException.java
	converter/src/main/java/org/search/bean/converter/ConverterHelper.java
	converter/src/main/java/org/search/bean/converter/config/BeanMappingConfiguration.java
	converter/src/main/java/org/search/bean/converter/config/PropertyConfiguration.java
	converter/src/main/java/org/search/bean/converter/config/process/MappingConfigXmlParserDelegate.java