Commit SWB manhã 29 de setembro
Merge branch 'master' of https://github.com/fabioar87/kidsetoys

Conflicts:
	catalogo/templates/catalogo/detalhe.html
	catalogo/templates/catalogo/home.html
Commit *