1
Merge branch 'master' of https://github.com/jonathanbugs/anselmi

Conflicts:

templates_c/3bbc19a77421d7c093499f3ca9f6698999e0d8cb.file.produto-detalh
e.tpl.php

templates_c/42c39aa80c66911ff710ce549df5ddc9ec237d43.file._rodape.tpl.ph
p

templates_c/65192527463818f8df3a78b636a6e2aeae195a18.file.carrinho.tpl.p
hp
	templates_c/7b9331a1b79c2af12eb8cdecd4323cbd20e19b3b.file._topo.tpl.php

templates_c/9206ffe216f3f7c2e7655782292928f7d20e8be5.file.footer.tpl.php

templates_c/a7749c6834b669ba7ed8349d2f905ac1d61b7c3a.file.inicial.tpl.ph
p

templates_c/be439f82a4dbec61746f62a0df07c19a7eecd966.file.header.tpl.php