cherry-pick from 90-dev
cherry-pick from 90-dev

Conflicts:
	product_price_factor/static/description/2.png
	product_price_factor/static/description/3.png
	product_price_factor/static/description/4.png
	product_price_factor/static/description/index.html

it-projects-llc/website-addons,it-projects-llc/website-addons,it-projects-llc/website-addons