首页，搜索，界面完成
首页，发现，界面完成
Merge pull request #11 from Ebingo/zhuchao

Zhuchao
首页，发现，界面完成_promote_commite
Merge remote-tracking branch 'origin/master'

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
首页，发现，界面完成,marge 后得提交
delete psd
Delete 23.psd
Delete 32.psd
Delete 23`1.psd
Delete 24.psd
Delete 25.psd
Delete 26.psd
Delete 30.psd
Delete 30`1.psd
Delete 31`1.psd
Delete 31`2.psd
Delete 31`3.psd
Delete 31`4.psd
Delete 2~3搜索_企业.psd