add application
添加login string
test zhuchao
test zhuchao2
Merge pull request #9 from Ebingo/zhuchao

test zhuchao2
test zhuchao3
Merge remote-tracking branch 'origin/master'
test01
test01
Merge branch 'master' into zhuchao
zc91-18-49
添加login string
修改 首页
Merge branch 'promote_branch'

Conflicts:
	app/src/main/res/layout/activity_search.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/values/dimens.xml
zhuchao92-1
Merge branch 'master' of https://github.com/Ebingo/Ebingo into zhuchao
zhuchao92-2
搜索页面
zhuchao92-2