resolve conflict
resolve merging problem
Merge branch 'master' of https://github.com/huhuo/general.git

Conflicts:
	component/huhuo-component-web/target/classes/META-INF/maven/com.huhuo/huhuo-component-web/pom.properties
	web-service/huhuo-web-base/target/classes/META-INF/maven/com.huhuo/huhuo-web-base/pom.properties