small improvement
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/catalog/cpages.php
	application/controllers/catalog/cproduct.php
	application/models/product.php
	application/views/catalog/footer.php
	application/views/catalog/header.php
	application/views/catalog/home.php
	application/views/catalog/list.php
	application/views/catalog/login.php
	application/views/catalog/navbar.php
	application/views/catalog/product.php
	css/style.css