Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	Classe Imovel -
Project/eclassimovel_web_2.0/nbproject/private/private.xml
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	Classe Imovel - Project/eclassimovel_web_2.0/build/web/DAO_JSP2/editar_cliente.jsp
	Classe Imovel - Project/eclassimovel_web_2.0/build/web/PAGINAS/cadastro_imovel.jsp
	Classe Imovel - Project/eclassimovel_web_2.0/web/DAO_JSP2/editar_cliente.jsp
	Classe Imovel - Project/eclassimovel_web_2.0/web/PAGINAS/cadastro_imovel.jsp