fff
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/PROJ_Master.apk
	bin/classes.dex
	bin/classes/com/zhongji/master/android/phone/R$dimen.class
	bin/classes/com/zhongji/master/android/phone/R$drawable.class
	bin/classes/com/zhongji/master/android/phone/R$id.class
	bin/classes/com/zhongji/master/android/phone/R$layout.class
	bin/classes/com/zhongji/master/android/phone/R$string.class
	bin/classes/com/zhongji/master/android/phone/R$style.class

	bin/classes/com/zhongji/master/android/phone/activity/company/CompanyMySelf.class

	bin/classes/com/zhongji/master/android/phone/activity/company/CompanyParticularsActivity.class

	bin/classes/com/zhongji/master/android/phone/activity/contacts/CenterActivity.class

	bin/classes/com/zhongji/master/android/phone/activity/contacts/ContactsActivity.class

	bin/classes/com/zhongji/master/android/phone/activity/contacts/PublishActivity.class

	bin/classes/com/zhongji/master/android/phone/activity/login/FoundPasswordActivity.class

	bin/classes/com/zhongji/master/android/phone/activity/login/LoginActivity$1.class

	bin/classes/com/zhongji/master/android/phone/activity/login/LoginActivity.class

	bin/classes/com/zhongji/master/android/phone/activity/login/RegisterActivity.class

	bin/classes/com/zhongji/master/android/phone/activity/product/ProductActivity.class

	bin/classes/com/zhongji/master/android/phone/base/BaseIndexActivity.class

	bin/classes/com/zhongji/master/android/phone/base/BaseSecondActivity.class
	bin/classes/com/zhongji/master/android/phone/net/HttpAPI.class

	bin/classes/com/zhongji/master/android/phone/widget/RTPullListView.class
	bin/resources.ap_