Celso
Merge branch 'master' of https://github.com/dereckleme/desenvolvimento

Conflicts:
	module/Base/view/base/index/produto.phtml
	module/Base/view/layout/index.phtml
	module/Base/view/layout/layoutCarrinho.phtml