VERSÃO FINAL

VERSÃO FINAL que ainda não é final
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/built-jar.properties
	build/classes/Controller/ControlDBEstoque.class
	build/classes/Controller/ControlDBQuarto.class
	build/classes/Controller/ControlDBServico.class
	build/classes/View/FormCadastroServico$1.class
	build/classes/View/FormCadastroServico$2.class
	build/classes/View/FormCadastroServico.class
	build/classes/View/FormEstoque$1.class
	build/classes/View/FormEstoque.class
	build/classes/View/FormPesquisaEstoque$1.class
	build/classes/View/FormPesquisaEstoque$2.class
	build/classes/View/FormPesquisaEstoque.class
	build/classes/View/FormQuartos$1.class
	build/classes/View/FormQuartos$2.class
	build/classes/View/FormQuartos$3.class
	build/classes/View/FormQuartos.class
	build/classes/View/FrameEditHospedes$1.class
	build/classes/View/FrameEditHospedes$2.class
	build/classes/View/FrameEditHospedes$3.class
	build/classes/View/FrameEditHospedes$4.class
	build/classes/View/FrameEditHospedes$5.class
	build/classes/View/FrameEditHospedes$6.class
	build/classes/View/FrameEditHospedes$7.class
	build/classes/View/FrameEditHospedes.class
	build/classes/View/FrameInicial.class
	build/classes/View/FrameLogin$4.class
	build/classes/View/FrameLogin.class
	nbproject/private/private.xml
	src/Controller/ControlDBEstoque.java
	src/Controller/ControlDBQuarto.java
	src/Controller/ControlDBServico.java
	src/View/FormCadastroServico.form
	src/View/FormCadastroServico.java
	src/View/FormEstoque.form
	src/View/FormEstoque.java
	src/View/FormPesquisaEstoque.form
	src/View/FormPesquisaEstoque.java
	src/View/FormQuartos.java
	src/View/FrameEditHospedes.java
	src/View/FrameInicial.java
	src/View/FrameLogin.java