bug fixed
bug fixed
Merge remote-tracking branch 'origin/master' into master_for_zc

Conflicts:
	app/src/main/res/layout/activity_product_info.xml