k
公共
hh
Merge branch 'master' of https://github.com/ZpzChinaMobileAndroid/PROJ_Collection

Conflicts:
	bin/PROJ_Collection.apk
	bin/classes.dex
	bin/classes/com/zhongji/collection/android/phone/R$id.class
	bin/classes/com/zhongji/collection/base/BaseActivity.class
	bin/classes/com/zhongji/collection/base/BaseIndexActivity$1.class
	bin/classes/com/zhongji/collection/base/BaseIndexActivity$2.class
	bin/classes/com/zhongji/collection/base/BaseIndexActivity.class
	bin/classes/com/zhongji/collection/base/BaseSecondActivity.class
	bin/classes/com/zhongji/collection/launch/GuideActivity.class
	bin/classes/com/zhongji/collection/login/LoginActivity$1.class
	bin/classes/com/zhongji/collection/login/LoginActivity.class
	bin/classes/com/zhongji/collection/project/MyProActivity.class
	bin/classes/com/zhongji/collection/project/NewProActivity.class
	bin/classes/com/zhongji/collection/project/SearchProActivity.class
	bin/classes/com/zhongji/collection/util/DataCleanManager.class
	bin/classes/com/zhongji/collection/util/PreferencesUtils.class
	bin/resources.ap_
	gen/com/zhongji/collection/android/phone/R.java
	src/com/zhongji/collection/entity/Project.java
	src/com/zhongji/collection/util/PreferencesUtils.java