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

Conflicts:
	module/Base/view/layout/layoutCarrinho.phtml
	public/js/publico.js
dereck
dereck