加载失败和加载中图片
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