z
Merge branch 'master' of https://github.com/mroland/VarjaoClipping.git

Conflicts:
	WebContent/pages/cliente.xhtml
	src/br/com/varjaoclipping/faces/ClienteFaces.java
Merge branch 'master' of https://github.com/mroland/VarjaoClipping.git