Merge pull request #3 from dauv815/master

Merge pull request #1 from MartinEmilio/master
carritodecompra
cambioProtectedproducto
Merge branch 'master' of https://github.com/MartinEmilio/tutienda
Merge pull request #4 from dauv815/master

Push total
Merge pull request #5 from dauv815/master

reformaCalificacion
Merge branch 'master' of https://github.com/MartinEmilio/tutienda

Conflicts:
	protected/controllers/TiendaController.php
	protected/views/tiendaHasDtProducto/_table.php
commitcarrito
Merge pull request #2 from MartinEmilio/master

carritoMartin