Merge branch 'master' of https://github.com/goper/psmet.loc

Conflicts:
	psmet.sql
Merge branch 'master' of https://github.com/goper/psmet.loc

Conflicts:
	application/views/index/catalog/products.php