teste
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/built-jar.properties
	build/classes/br/com/level/celesc/dao/IEmpreiteiraDAO.class
	build/classes/br/com/level/celesc/dao/IEmpresaUsuarioDAO.class
	build/classes/br/com/level/celesc/dao/IEntregaDAO.class
	build/classes/br/com/level/celesc/dao/IErroDAO.class
	build/classes/br/com/level/celesc/dao/ILeituristaDAO.class
	build/classes/br/com/level/celesc/dao/ILocalidadeDAO.class
	build/classes/br/com/level/celesc/dao/IOcorrenciaDAO.class
	build/classes/br/com/level/celesc/dao/IReferenciaLivroDAO.class
	build/classes/br/com/level/celesc/dao/IRetornoDAO.class
	build/classes/br/com/level/celesc/dao/IServicoDAO.class
	build/classes/br/com/level/celesc/dao/ISituacaoDAO.class
	build/classes/br/com/level/celesc/dao/ITipoLocalidadeDAO.class
	build/classes/br/com/level/celesc/dao/impl/EmpreiteiraDAO.class
	build/classes/br/com/level/celesc/dao/impl/EmpresaUsuarioDAO.class
	build/classes/br/com/level/celesc/dao/impl/EntregaDAO.class
	build/classes/br/com/level/celesc/dao/impl/ErroDAO.class
	build/classes/br/com/level/celesc/dao/impl/LeituristaDAO.class
	build/classes/br/com/level/celesc/dao/impl/LocalidadeDAO.class
	build/classes/br/com/level/celesc/dao/impl/OcorrenciaDAO.class
	build/classes/br/com/level/celesc/dao/impl/ReferenciaLivroDAO.class
	build/classes/br/com/level/celesc/dao/impl/RetornoDAO.class
	build/classes/br/com/level/celesc/dao/impl/ServicoDAO.class
	build/classes/br/com/level/celesc/dao/impl/SituacaoDAO.class
	build/classes/br/com/level/celesc/dao/impl/TipoLocalidadeDAO.class
	dist/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar
	dist/lib/javassist-3.15.0-GA.jar
	dist/lib/jboss-logging-3.1.0.GA.jar