Synchronizing with client site
Merge branch 'master' of https://github.com/dioscouri/tienda.git

Conflicts:
	tienda/admin/helpers/diagnostics.php
	tienda/admin/helpers/product.php
	tienda/admin/install/install-innodb.sql
	tienda/admin/install/install-myisam.sql
	tienda/admin/install/install.sql
	tienda/admin/library/select.php
	tienda/admin/models/_baseeav.php
	tienda/admin/models/productprices.php
	tienda/admin/models/products.php
	tienda/admin/views/pos/tmpl/default_step1.php
	tienda/admin/views/pos/tmpl/form_address.php
	tienda/site/controllers/products.php
	tienda/site/views/products/tmpl/product_buy.php