modified:   src/com/holding/smile/activity/BaseActivity.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	smile_android/src/com/holding/smile/activity/BaseActivity.java

	modified:   src/com/holding/smile/activity/BaseActivity.java
	modified:   src/com/holding/smile/activity/IndexActivity.java
	modified:   src/com/holding/smile/activity/MainTwoActivity.java
	modified:   src/com/holding/smile/activity/MyApplication.java
	modified:   src/com/holding/smile/activity/MyOrdersActivity.java
	modified:   src/com/holding/smile/activity/MySmileActivity.java
	modified:   src/com/holding/smile/activity/OrderDetailActivity.java
	modified:   src/com/holding/smile/activity/WebViewActivity.java
	modified:   src/com/holding/smile/cache/AbstractFileCache.java
	modified:   src/com/holding/smile/cache/MemoryCache.java
	modified:   src/com/holding/smile/myview/MyLinearLayout.java
	modified:   src/com/holding/smile/myview/PullToRefreshView.java
	modified:   src/com/holding/smile/service/DataService.java
	modified:   src/com/holding/smile/service/LoginService.java
	modified:   src/com/holding/smile/service/SQLiteService.java
	modified:   src/com/holding/smile/tools/BitmapUtils.java
	modified:   src/com/holding/smile/tools/FileUtils.java
	modified:   src/com/holding/smile/tools/ImgUtil.java
	modified:   src/com/holding/smile/tools/JSONUtil.java
	modified:   src/com/holding/smile/tools/NullHostNameVerifier.java
	modified:   src/com/holding/smile/tools/RecycleBitmapUtil.java
	modified:   src/com/holding/smile/tools/URLUtil.java
	modified:   src/com/holding/smile/tools/UpdateManager.java
	modified:   src/com/holding/smile/tools/jpush/MyReceiver.java
	modified:   AndroidManifest.xml
	new file:   libs/testinagent-v1.4.jar
	modified:   proguard-project.txt
	modified:   res/values/strings.xml