Gráficos.
Merge branch 'master' of https://github.com/joaoSakai/mendes-project

Conflicts:
	mendes-project/MendesProject/WebContent/paginas/cadastroServico.xhtml
	mendes-project/MendesProject/WebContent/paginas/consultaServico.xhtml
	mendes-project/MendesProject/src/java/br/com/mendes/view/ServicoMB.java
Css
Erro -  Encoding - Merge
Merge pull request #12 from 6uimorais/master

Graficos + Outros