jhfdkj
Merge branch 'master' of https://github.com/bachtx/BookStore_Online

Conflicts:
	components/com_order/tem/cart.php
	components/com_products/tem/detail.php