zhuchao92-1
Merge branch 'master' of https://github.com/Ebingo/Ebingo into zhuchao
zhuchao92-2
zhuchao93-1
zhuchao93-1
Merge branch 'zhuchao'

Conflicts:
	app/src/main/java/com/promote/ebingo/application/HttpConstant.java
	app/src/main/java/com/promote/ebingo/bean/SearchHistoryBean.java
	app/src/main/java/com/promote/ebingo/bean/SearchInterpriseBean.java
	app/src/main/java/com/promote/ebingo/publish/PublishFragment.java
	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
	app/src/main/java/com/promote/ebingo/search/SearchListAdapter.java
	app/src/main/res/layout/activity_search.xml
	app/src/main/res/values/strings.xml
zhuchao93-1