12
Merge branch 'master' of github.com:foright/yami

Conflicts:
	components/com_jshopping/templates/default/products/products.php
Merge branch 'master' of github.com:foright/yami

Conflicts:
	components/com_jshopping/templates/default/products/products.php