deleted:    gen/com/holding/smile/R.java
	modified:   obj/local/armeabi/libjni_curl.so
	modified:   obj/local/armeabi/objs/jni_curl/m.o
	modified:   proguard/dump.txt
	modified:   proguard/mapping.txt
	modified:   proguard/seeds.txt
	modified:   proguard/usage.txt
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	smile_android/gen/com/holding/smile/R.java

	modified:   src/com/holding/smile/activity/BaseActivity.java
	modified:   src/com/holding/smile/activity/EmailActivity.java
	modified:   src/com/holding/smile/activity/GoodsDetailActivity.java
	modified:   src/com/holding/smile/activity/HtmlUIActivity.java
	modified:   src/com/holding/smile/activity/IdcardEditActivity.java
	modified:   src/com/holding/smile/activity/IdcardManagerActivity.java
	modified:   src/com/holding/smile/activity/LoginActivity.java
modified:   src/com/holding/smile/activity/MainSmileActivity.java
	modified:   src/com/holding/smile/activity/MainTwoActivity.java
modified:   src/com/holding/smile/activity/OrderDetailActivity.java
	modified:   src/com/holding/smile/activity/OrderInformActivity.java
modified:   src/com/holding/smile/activity/PersonalSettingsActivity.java
modified:   src/com/holding/smile/activity/RegisterActivity.java
	modified:   src/com/holding/smile/activity/ResetPwdActivity.java
	modified:   src/com/holding/smile/activity/SearchGoodsActivity.java
	modified:   src/com/holding/smile/activity/ShoppingCartActivity.java
	modified:   src/com/holding/smile/activity/SortActivity.java
	modified:   src/com/holding/smile/activity/WebViewActivity.java
	modified:   ../smilecms/src/main/java/com/flyhz/shop/dto/ProductParamDto.java
	modified:   ../smilecms/src/main/java/com/flyhz/shop/persistence/dao/ProductDao.java
modified:   ../smilecms/src/main/java/com/flyhz/shop/persistence/entity/ProductModel.java
	modified:   ../smilecms/src/main/java/com/flyhz/shop/service/ProductService.java
	modified:   ../smilecms/src/main/java/com/flyhz/shop/web/controller/ProductController.java
	modified:   ../smilecms/src/main/resources/mybatis/sqlmap/ProductMapper.xml