modified:   smile/src/main/java/com/flyhz/shop/service/impl/IdcardServiceImpl.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	smile_android/src/com/holding/smile/myview/MyLinearLayout.java

	modified:   smile_android/res/layout/color_item.xml
	modified:   smile_android/res/layout/goods_detail_view.xml
	modified:   smile_android/res/values/strings.xml
	modified:   smile_android/src/com/holding/smile/activity/GoodsDetailActivity.java
	modified:   smile_android/src/com/holding/smile/adapter/ColorAdapter.java
	modified:   smile_android/src/com/holding/smile/adapter/HorizontalGridViewAdapter.java
	modified:   smile_android/src/com/holding/smile/adapter/MyJGoodsAdapter.java
	modified:   smile_android/src/com/holding/smile/cache/ImageLoader.java
	modified:   smile_android/src/com/holding/smile/entity/JColor.java
	modified:   smile_android/src/com/holding/smile/entity/JGoods.java
	modified:   smile_android/src/com/holding/smile/myview/MyLinearLayout.java