dddd
Merge branch 'master' of https://github.com/ZpzChinaMobileAndroid/PROJ_Master

Conflicts:
	bin/PROJ_Master.apk
	bin/classes.dex
	bin/dexedLibs/BaiduLBS_Android-13220843ae4dcea43a066190a54b6671.jar
	bin/dexedLibs/Msc-38bff12b32c6b856f5f09942eab28bb1.jar
	bin/dexedLibs/afinal_0.5.1_bin-e127d5e655877e101150c3a7dc5f0d0f.jar

bin/dexedLibs/android-async-http-1.4.5-3fe91e9d1b460636acdee187ce1b091b.
jar
	bin/dexedLibs/android-support-v4-a412ec9780c8f3188797df13fe7fdf70.jar
	bin/dexedLibs/commons-codec-1.8-3241a4fc324e45b49be5e164e682c895.jar
	bin/dexedLibs/fastjson-1.1.40-3fdcb194a7f538991ddf6c024dc1bc7a.jar
	bin/dexedLibs/locSDK_3.1-813c0b4aea6a6903b91a0dccd31e19c2.jar
	bin/dexedLibs/slidingmenu-35255eae1efb0dc3d96b50b03f893a2d.jar

bin/dexedLibs/universal-image-loader-1.9.2-with-sources-149e588e1a0f8c2a
279e6900bd0c8475.jar
	bin/resources.ap_
	src/com/zhongji/master/android/phone/activity/login/LoginActivity.java
dd