tesd
oi
p
christopher 1/12
Merge branch 'master' of
https://github.com/christopherscotini/projetofinal.git

Conflicts:
	MKOFFICE_FINAL/src/main/java/br/com/mkoffice/view/bundle/Messages_pt.properties
	MKOFFICE_FINAL/src/main/java/br/com/mkoffice/view/controller/menu/clientes/ClienteBean.java
	MKOFFICE_FINAL/src/main/java/br/com/mkoffice/view/controller/menu/report/PromocaoClientePorVolumeCompraBean.java
	MKOFFICE_FINAL/src/main/webapp/content/m-caixa/contasPagar.xhtml
	MKOFFICE_FINAL/src/main/webapp/content/m-caixa/contasReceber.xhtml
	MKOFFICE_FINAL/src/main/webapp/content/m-cliente/altCliente.xhtml
	MKOFFICE_FINAL/src/main/webapp/content/m-cliente/conClientes.xhtml
	MKOFFICE_FINAL/src/main/webapp/content/m-cliente/incCliente.xhtml
	MKOFFICE_FINAL/src/main/webapp/content/m-pedidos/sm-consultarpedido/detalharHistoricoPedido.xhtml
	MKOFFICE_FINAL/src/main/webapp/content/m-pedidos/sm-consultarpedido/listarHistoricoPedidos.xhtml
	MKOFFICE_FINAL/src/main/webapp/content/m-pedidos/sm-efetuarpedido/concluirPedido.xhtml
	MKOFFICE_FINAL/src/main/webapp/content/m-pedidos/sm-efetuarpedido/dadosPedido.xhtml
	MKOFFICE_FINAL/src/main/webapp/content/m-pedidos/sm-efetuarpedido/selecionarProdutosPedido.xhtml
	MKOFFICE_FINAL/src/main/webapp/content/m-pedidos/sm-importarpedido/concluirPedidoImportado.xhtml
	MKOFFICE_FINAL/src/main/webapp/content/m-pedidos/sm-importarpedido/dadosPedidoImportado.xhtml
	MKOFFICE_FINAL/src/main/webapp/content/m-pedidos/sm-importarpedido/importarPedido.xhtml
	MKOFFICE_FINAL/src/main/webapp/content/m-produtos/catalogoProdutosMaryKay.xhtml
	MKOFFICE_FINAL/src/main/webapp/content/m-produtos/listarCategorias.xhtml
	MKOFFICE_FINAL/src/main/webapp/content/m-produtos/listarEstoque.xhtml
	MKOFFICE_FINAL/src/main/webapp/content/m-venda/dadosVenda.xhtml
	MKOFFICE_FINAL/src/main/webapp/content/m-venda/detalharVenda.xhtml
	MKOFFICE_FINAL/src/main/webapp/content/m-venda/finalizarVenda.xhtml
	MKOFFICE_FINAL/src/main/webapp/content/m-venda/listarHistoricoVendas.xhtml
	MKOFFICE_FINAL/src/main/webapp/content/m-venda/selecionarProdutosVenda.xhtml