添加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