加载失败和加载中图片
Merge branch 'master' of https://github.com/Ebingo/Ebingo into promote_branch

Conflicts:
	app/src/main/res/drawable-xhdpi/img_big_failed.png
Merge branch 'master' of https://github.com/Ebingo/Ebingo into promote_branch

Conflicts:
	app/src/main/res/drawable-xhdpi/img_big_failed.png
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/values/strings.xml
修改加载中，加载失败图片
选择框修改，细节优化，发布审核
Merge branch 'master' of https://github.com/Ebingo/Ebingo

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/promote/ebingo/util/ContextUtil.java
	app/src/main/java/com/promote/ebingo/util/FileUtil.java
	app/src/main/res/values/strings.xml
企业详情,添加vip图片
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/promote/ebingo/util/ContextUtil.java
	app/src/main/java/com/promote/ebingo/util/FileUtil.java
	app/src/main/res/values/strings.xml
icon
企业详情,添加vip图片
企业详情,添加vip图片
Merge branch 'master' into promote_branch
icon