`	modified:   src/com/holding/smile/adapter/MyShoppingCartAdapter.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	smile_android/src/com/holding/smile/adapter/MyShoppingCartAdapter.java

	new file:   ../avengers/pom.xml
	new file:   ../avengers/src/main/java/com/flyhz/avengers/Avengers.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/AvengersAction.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/AvengersEvent.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/AvengersEventRegister.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/AvengersObject.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/Config.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/RecursiveDemo.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/TestAll.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/dto/NuaaPersonDto.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/dto/ProductDto.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/dto/RtnResult.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/framework/ResultFilter.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/framework/Template.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/framework/UrlFilter.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/framework/UrlParser.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/framework/xml/Avengers.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/framework/xml/Domain.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/framework/xml/ObjectFactory.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/framework/xml/package-info.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/parser/BaseParser.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/parser/CoachParser.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/parser/CoachUrlParser.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/parser/NuaaParser.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/template/CoachDetailTemplate.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/template/CoachUrlTemplate.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/template/NuaaTemplate.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/template/impl/BaseUrlFilter.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/template/impl/RecursiveCall.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/template/impl/coach/CoachTemplateImpl.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/template/impl/coach/CoachUrlFilterImpl.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/template/impl/coach/CoachUrlParserImpl.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/template/impl/coach/ResultFilterImpl.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/template/impl/nuaa/NuaaTemplateImpl.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/util/AvengersDataUtil.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/util/Constants.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/util/DateUtil.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/util/MD5.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/util/RandomString.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/util/ReflectHelper.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/util/RegexUtils.java	new file:   ../avengers/src/main/java/com/flyhz/avengers/util/StringUtil.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/util/UrlUtil.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/util/ValidateUtil.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/util/WebClientUtil.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/util/XmlUtil.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/util/image/Image.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/util/image/ImageConsole.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/util/image/ImageMitiThread.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/util/image/ImagePool.java#	new file:   ../avengers/src/main/java/com/flyhz/avengers/util/image/ImageThread.java
	new file:   ../avengers/src/main/java/com/flyhz/avengers/util/image/ImageUtil.java
	new file:   ../avengers/src/main/resources/avengers.xml