modified:   src/main/java/com/flyhz/avengers/common/event/URLCrawlEvent.java
	modified:   src/main/java/com/flyhz/avengers/framework/AvengersAppMaster.java
	modified:   src/main/java/com/flyhz/avengers/framework/AvengersExecutor.java
	modified:   src/main/java/com/flyhz/avengers/framework/Crawl.java
	modified:   src/main/java/com/flyhz/avengers/framework/config/XConfiguration.java
	modified:   src/main/java/com/flyhz/avengers/framework/config/xml/ObjectFactory.java
	modified:   src/main/java/com/flyhz/avengers/framework/config/xml/XDomain.java
	modified:   src/main/resources/avengers.xml
	modified:   src/main/resources/avengers.xsd
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	avengers/src/main/java/com/flyhz/avengers/common/event/URLCrawlEvent.java
	avengers/src/main/java/com/flyhz/avengers/framework/Crawl.java
	avengers/src/main/java/com/flyhz/avengers/framework/config/XConfiguration.java
	avengers/src/main/resources/avengers.xml
 Changes to be committed:
 	modified:   src/main/java/com/flyhz/avengers/common/event/TemplateApplyEvent.java
 	modified:   src/main/java/com/flyhz/avengers/common/event/URLCrawlEvent.java
 	modified:   src/main/java/com/flyhz/avengers/common/event/URLFetchEvent.java
 	new file:   src/main/java/com/flyhz/avengers/domains/abercrombie/template/AbercrombieProductTemplateImpl.java
 	modified:   src/main/java/com/flyhz/avengers/framework/Analyze.java
 	modified:   src/main/java/com/flyhz/avengers/framework/AvengersAppMaster.java
 	modified:   src/main/java/com/flyhz/avengers/framework/Crawl.java
 	modified:   src/main/java/com/flyhz/avengers/framework/Fetch.java
 	modified:   src/main/java/com/flyhz/avengers/framework/Template.java
 	modified:   src/main/java/com/flyhz/avengers/framework/config/XConfiguration.java
 	modified:   src/main/java/com/flyhz/avengers/framework/config/xml/ObjectFactory.java
 	modified:   src/main/java/com/flyhz/avengers/framework/config/xml/XDomain.java
 	new file:   src/main/java/com/flyhz/avengers/framework/util/SerializableUtil.java
 	modified:   src/main/java/com/flyhz/avengers/framework/util/StringUtil.java
 	deleted:    src/main/java/com/flyhz/avengers/framework/util/filter/URLFilterUtil.java
 	modified:   src/main/resources/avengers.xml
 	modified:   src/main/resources/avengers.xsd
 	modified:   ../smile_android/gen/com/holding/smile/R.java
 	modified:   ../smile_android/jni/m.cpp
 	modified:   ../smile_android/res/layout/good_pic_item.xml
 	modified:   ../smile_android/res/layout/index_item.xml
 	modified:   ../smile_android/res/layout/smile_main.xml
 	modified:   ../smile_android/res/menu/main.xml
 	modified:   ../smile_android/src/com/holding/smile/activity/BaseActivity.java
 	modified:   ../smile_android/src/com/holding/smile/activity/CategoryActivity.java
 	modified:   ../smile_android/src/com/holding/smile/activity/GoodsDetailActivity.java
 	modified:   ../smile_android/src/com/holding/smile/activity/IdcardEditActivity.java
 	modified:   ../smile_android/src/com/holding/smile/activity/IdcardManagerActivity.java
 	modified:   ../smile_android/src/com/holding/smile/activity/LoginActivity.java
 	modified:   ../smile_android/src/com/holding/smile/activity/MainSmileActivity.java
 	modified:   ../smile_android/src/com/holding/smile/activity/MainTwoActivity.java
 	modified:   ../smile_android/src/com/holding/smile/activity/MyApplication.java
 	modified:   ../smile_android/src/com/holding/smile/activity/MySmileActivity.java
 	modified:   ../smile_android/src/com/holding/smile/activity/OrderInformActivity.java
 	modified:   ../smile_android/src/com/holding/smile/activity/SearchGoodsActivity.java
 	modified:   ../smile_android/src/com/holding/smile/activity/ShoppingCartActivity.java
 	modified:   ../smile_android/src/com/holding/smile/activity/SortActivity.java
 	modified:   ../smile_android/src/com/holding/smile/activity/WebViewActivity.java
 	modified:   ../smile_android/src/com/holding/smile/adapter/BrandAdapter.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz