small change
New changelist
Merge branch 'promote_branch'
找回密码，各种删除列表，发布供应bug处理，细节处理。
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/promote/ebingo/InformationActivity/ProductInfoActivity.java