Subindo
Merge branch 'master' of https://github.com/vtonus/mercearia-1.git

Conflicts:
	mercearia-master/mercearia/WebContent/views/Menu.jsp
Merge branch 'master' of https://github.com/vtonus/mercearia-1.git
BuscaCompra + NovaCompra - Little Patch