首页，发现，界面完成
首页，发现，界面完成_promote_commite
更改提交错误
Merge branch 'promote_branch'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/res/values/colors.xml
	app/src/main/res/values/strings.xml
	app/src/main/res/values/styles.xml
	design/doc/0909/4`2.png
	design/doc/0909/Ebingoo功能细化PDF格式.zip
	design/doc/0909/Ebingoo功能细化PDF格式/1首页功能细化.pdf
	design/doc/0909/Ebingoo功能细化PDF格式/2搜索页面功能细化.pdf
	design/doc/0909/Ebingoo功能细化PDF格式/3发现页面功能说明.pdf
	design/doc/0909/Ebingoo功能细化PDF格式/5发布功能细化.pdf
	design/doc/0909/Ebingoo功能细化PDF格式/6企业相关页面功能介绍.pdf
	design/doc/0909/Ebingoo功能细化PDF格式/7个人中心页面功能介绍.pdf
	design/doc/0909/~$文档9.4上午更新.docx
	design/doc/0909/我的特权修改说明.doc
	design/doc/0909/找回密码功能修改说明.doc
	design/doc/0909/接口文档9.9下午更新.docx
	design/doc/0909/接口文档9.9下午更新.pdf
	design/resurce/0909/20140909个人中心（安卓）/效果图/22.png
	design/resurce/0909/20140909个人中心（安卓）/效果图/23.png
	design/resurce/0909/20140909个人中心（安卓）/效果图/23`1.png
	design/resurce/0909/20140909个人中心（安卓）/效果图/24.png
	design/resurce/0909/20140909个人中心（安卓）/效果图/25.png
	design/resurce/0909/20140909个人中心（安卓）/效果图/26.png
	design/resurce/0909/20140909个人中心（安卓）/效果图/30.png
	design/resurce/0909/20140909个人中心（安卓）/效果图/30`1.png
	design/resurce/0909/20140909个人中心（安卓）/效果图/31`1.png
	design/resurce/0909/20140909个人中心（安卓）/效果图/31`2.png
	design/resurce/0909/20140909个人中心（安卓）/效果图/31`3.jpg
	design/resurce/0909/20140909个人中心（安卓）/效果图/31`4.png
	design/resurce/0909/20140909个人中心（安卓）/效果图/32.png
	design/resurce/0909/20140909搜索/效果图/2~1搜索_供应.jpg
	design/resurce/0909/20140909搜索/效果图/2~2搜索_求购.jpg
	design/resurce/0909/20140909搜索/效果图/2~3搜索_企业.jpg
	design/resurce/0909/20140909搜索/标注/2~3搜索_企业_MarkMan.png
	design/resurce/0909/CZ9.9/1.png
	design/resurce/0909/CZ9.9/10.png
	design/resurce/0909/CZ9.9/11.png
	design/resurce/0909/CZ9.9/12.png
	design/resurce/0909/CZ9.9/13.png
	design/resurce/0909/CZ9.9/13`1.png
	design/resurce/0909/CZ9.9/14.png
	design/resurce/0909/CZ9.9/17.png
	design/resurce/0909/CZ9.9/18.png
	design/resurce/0909/CZ9.9/19.png
	design/resurce/0909/CZ9.9/1`1.jpg
	design/resurce/0909/CZ9.9/2.png
	design/resurce/0909/CZ9.9/20.png
	design/resurce/0909/CZ9.9/20`1.png
	design/resurce/0909/CZ9.9/21.png
	design/resurce/0909/CZ9.9/22.png
	design/resurce/0909/CZ9.9/23.png
	design/resurce/0909/CZ9.9/23`1.png
	design/resurce/0909/CZ9.9/24.png
	design/resurce/0909/CZ9.9/25.png
	design/resurce/0909/CZ9.9/26.png
	design/resurce/0909/CZ9.9/27`1.jpg
	design/resurce/0909/CZ9.9/27`2.jpg
	design/resurce/0909/CZ9.9/27`3.jpg
	design/resurce/0909/CZ9.9/2`1.png
	design/resurce/0909/CZ9.9/2`2.png
	design/resurce/0909/CZ9.9/2`3.png
	design/resurce/0909/CZ9.9/3.png
	design/resurce/0909/CZ9.9/30.png
	design/resurce/0909/CZ9.9/30`1.png
	design/resurce/0909/CZ9.9/31`1.png
	design/resurce/0909/CZ9.9/31`2.png
	design/resurce/0909/CZ9.9/31`3.png
	design/resurce/0909/CZ9.9/31`4.png
	design/resurce/0909/CZ9.9/32.png
	design/resurce/0909/CZ9.9/35.png
	design/resurce/0909/CZ9.9/35`1.png
	design/resurce/0909/CZ9.9/36.png
	design/resurce/0909/CZ9.9/36`1.png
	design/resurce/0909/CZ9.9/36`2.png
	design/resurce/0909/CZ9.9/36`3.png
	design/resurce/0909/CZ9.9/4.jpg
	design/resurce/0909/CZ9.9/4`1.jpg
	design/resurce/0909/CZ9.9/4`2.png
	design/resurce/0909/CZ9.9/5.png
	design/resurce/0909/CZ9.9/5`1.png
	design/resurce/0909/CZ9.9/6.png
	design/resurce/0909/CZ9.9/6`1.png
	design/resurce/0909/CZ9.9/7.png
	design/resurce/0909/CZ9.9/8`1.png
	design/resurce/0909/CZ9.9/8`2.png
	design/resurce/0909/CZ9.9/8`3.png
	design/resurce/0909/CZ9.9/8`4.png
	design/resurce/0909/CZ9.9/9.png
	design/resurce/0909/CZ9.9/9·1.png
	design/resurce/0909/我的特权修改说明.doc
	design/resurce/0909/找回密码功能修改说明.doc
	design/resurce/0909/接口文档9.4上午更新.docx
	design/resurce/0909/最新2.zip
merge failed
Merge remote-tracking branch 'origin/master'