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

Conflicts:
	libs/cls.products.php
Merge branch 'master' of https://github.com/ngabt/bookstores