优化
优化
Merge remote-tracking branch 'origin/master' into master_for_zc

Conflicts:
	app/src/main/java/com/promote/ebingo/category/CategoryActivity.java