butterfly left-right
Merge branch 'master' of https://github.com/nickyudha/ayujewellery-new

Conflicts:
	files/common/sample_product-1.png
	files/common/sample_product-2.png