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

Conflicts:
	components/com_products/tem/detail.php
	templates/home.php