conflito
confito
Merge branch 'master' of github.com:luanrafael/ecommerce

Conflicts:
	src/main/webapp/view/template/template.xhtml