Removido diretório do projeto submetido a mais.
refs #464

git-svn-id: svn://hslife.com.br/hslife/orcamento/trunk@496 790cd0c2-49b5-4a51-aabf-19842a6fa872
Merge remote-tracking branch 'origin/gitbranch' into svnbranch
http://redmine.hslife.com.br/issues/464
refs #464

Conflicts:
	.settings/.jsdtscope
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.wst.common.project.facet.core.xml
	LICENSE.txt
	WebContent/WEB-INF/faces-config.xml
	WebContent/WEB-INF/lib/org.springframework.spring-library-3.1.2.RELEASE.libd
	WebContent/WEB-INF/web.xml
	WebContent/acessoNegado.xhtml
	WebContent/efetuarRegistro.xhtml
	WebContent/erroLogin.xhtml
	WebContent/index.jsp
	WebContent/login.xhtml
	WebContent/menu/cadastros.xhtml
	WebContent/menu/inicio.xhtml
	WebContent/menu/lancamentos.xhtml
	WebContent/menu/opcoes.xhtml
	WebContent/menu/resumos.xhtml
	WebContent/menu/sitemap.xhtml
	WebContent/modules/Agenda/listAgenda.xhtml
	WebContent/modules/Banco/listBanco.xhtml
	WebContent/modules/CartaoCredito/formCartaoCredito.xhtml
	WebContent/modules/CartaoCredito/listCartaoCredito.xhtml
	WebContent/modules/Categoria/listCategoria.xhtml
	WebContent/modules/CategoriaDocumento/listCategoriaDocumento.xhtml
	WebContent/modules/Conta/listConta.xhtml
	WebContent/modules/Documento/listDocumento.xhtml
	WebContent/modules/FechamentoPeriodo/listFechamentoPeriodo.xhtml
	WebContent/modules/Lancamento/copiarLancamento.xhtml
	WebContent/modules/Lancamento/duplicarLancamento.xhtml
	WebContent/modules/Lancamento/formLancamento.xhtml
	WebContent/modules/Lancamento/listLancamento.xhtml
	WebContent/modules/Lancamento/moverLancamento.xhtml
	WebContent/modules/Lancamento/viewLancamento.xhtml
	WebContent/modules/MeioPagamento/listMeioPagamento.xhtml
	WebContent/recuperarSenha.xhtml
	WebContent/resources/scripts/jquery.maskedinput-1.3.js
	WebContent/templates/acesso.xhtml
	WebContent/templates/listagem.xhtml
	WebContent/templates/principal.xhtml
	docs/Orçamento Doméstico - Documentação.asta
	docs/create-db.sql
	docs/update-db.sql
	src/br/com/hslife/orcamento/component/CategoriaComponent.java
	src/br/com/hslife/orcamento/component/ContaComponent.java
	src/br/com/hslife/orcamento/component/LancamentoComponent.java
	src/br/com/hslife/orcamento/controller/AgendaController.java
	src/br/com/hslife/orcamento/controller/CartaoCreditoController.java
	src/br/com/hslife/orcamento/controller/FavorecidoController.java
	src/br/com/hslife/orcamento/entities/BuscaSalva.java
	src/br/com/hslife/orcamento/entities/CartaoCredito.java
	src/br/com/hslife/orcamento/enumeration/TipoCategoria.java
	src/br/com/hslife/orcamento/enumeration/TipoConta.java
	src/br/com/hslife/orcamento/exception/BusinessException.java
	src/br/com/hslife/orcamento/interfaces/ICartaoCredito.java
	src/br/com/hslife/orcamento/interfaces/ILogic.java
	src/br/com/hslife/orcamento/model/CompraConsumoOperacaoDespensa.java
	src/br/com/hslife/orcamento/repository/AberturaFechamentoContaRepository.java
	src/br/com/hslife/orcamento/repository/CartaoCreditoRepository.java
	src/br/com/hslife/orcamento/repository/CategoriaRepository.java
	src/br/com/hslife/orcamento/repository/ContaRepository.java
	src/br/com/hslife/orcamento/repository/FavorecidoRepository.java
	src/br/com/hslife/orcamento/repository/FechamentoPeriodoRepository.java
	src/br/com/hslife/orcamento/repository/LancamentoRepository.java
	src/br/com/hslife/orcamento/repository/MeioPagamentoRepository.java
	src/br/com/hslife/orcamento/service/CRUDLogic.java
	src/br/com/hslife/orcamento/service/CartaoCreditoService.java
	src/br/com/hslife/orcamento/util/LoadEntityCombo.java
	src/br/com/hslife/orcamento/util/ViewUtil.java
	src/db-config.xml
	src/jdbc.properties
	test/br/com/hslife/orcamento/util/TestData.java

git-svn-id: svn://hslife.com.br/hslife/orcamento/trunk@497 790cd0c2-49b5-4a51-aabf-19842a6fa872