modified:   res/layout/myself_layout.xml
	modified:   src/com/holding/smile/activity/MyApplication.java
	modified:   src/com/holding/smile/adapter/MyJGoodsAdapter.java
	modified:   src/com/holding/smile/activity/MainTwoActivity.java
	modified:   src/com/holding/smile/activity/MyApplication.java
	modified:   src/com/holding/smile/adapter/MyJGoodsAdapter.java
	modified:   src/com/holding/smile/myview/PullToRefreshView.java
	new file:   src/com/holding/smile/tools/ImageLoader.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
	modified:   src/com/holding/smile/activity/MainActivity.java
	modified:   src/com/holding/smile/activity/MainTwoActivity.java
	modified:   src/com/holding/smile/activity/MyApplication.java
	modified:   src/com/holding/smile/activity/SearchGoodsActivity.java
	modified:   src/com/holding/smile/adapter/HorizontalGridViewAdapter.java
	modified:   src/com/holding/smile/adapter/ImageAdapter.java
	modified:   src/com/holding/smile/adapter/MyJGoodsAdapter.java
	modified:   src/com/holding/smile/adapter/RecommendGoodsAdapter.java
	modified:   src/com/holding/smile/adapter/VerticalListAdapter.java
	new file:   src/com/holding/smile/cache/AbstractFileCache.java
	new file:   src/com/holding/smile/cache/FileCache.java
	new file:   src/com/holding/smile/cache/ImageLoader.java
	new file:   src/com/holding/smile/cache/MemoryCache.java
	new file:   src/com/holding/smile/tools/CommonLog.java
	new file:   src/com/holding/smile/tools/CommonUtil.java
	new file:   src/com/holding/smile/tools/FileHelper.java
	new file:   src/com/holding/smile/tools/FileManager.java
	deleted:    src/com/holding/smile/tools/ImageLoader.java
	modified:   src/com/holding/smile/tools/ImgUtil.java
	new file:   src/com/holding/smile/tools/LogFactory.java