.
Merge branch 'master' of
https://github.com/victoriholc/Projeto-Assistencia-Tecnica-Renan.git

Conflicts:
	src/br/com/assistenciaTecnica/cadastral/managedBeans/PieceBean.java
	src/br/com/assistenciaTecnica/cadastral/managedBeans/ProductBean.java