zhuchao93-1
Merge branch 'master' of https://github.com/Ebingo/Ebingo into zhuchao
zhuchao93-1
9-4
9-4
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/promote/ebingo/publish/PublishDemandFragment.java
9-4
9-4
Merge branch 'zhuchao'