f
f
Merge branch 'master' of https://github.com/huong-dao/cozy

Conflicts:
	app/code/local/Cozy/Cozybase/Block/Catalog/Promotion.php
	app/design/frontend/cozy/default/template/page/html/home.phtml
	media/catalog/product/cache/1/small_image/263x175/9df78eab33525d08d6e5fb8d27136e95/images/catalog/product/placeholder/small_image.jpg
	media/catalog/product/cache/1/small_image/278x185/9df78eab33525d08d6e5fb8d27136e95/p/r/prod-detail_1.jpg
	media/catalog/product/cache/1/small_image/278x185/9df78eab33525d08d6e5fb8d27136e95/p/r/prod-detail_2.jpg
fg
fdg
abc
abc