1. Configurando messages.properties.
Merge branch 'master' of https://github.com/rof20004/vendasonline.git

Conflicts:
	src/main/resources/messages.properties
	src/main/webapp/menu.xhtml
1. Commit depois do merge.