bachtx
Merge branch 'master' of https://github.com/ngabt/bookstores

Conflicts:
	components/com_products/tem/detail.php
	libs/cls.products.php