搜索页面
Merge remote-tracking branch 'origin/master'
搜索页面
搜索页面，添加分类搜索功能。
Merge remote-tracking branch 'origin/master'
Merge branch 'promote_branch'

Conflicts:
	app/src/main/java/com/promote/ebingo/publish/login/RegisterActivity.java
	app/src/main/java/com/promote/ebingo/publish/login/RegisterInputYzm.java
	app/src/main/java/com/promote/ebingo/search/SearchActivity.java