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

Conflicts:
	libs/cls.products.php