comittando
Merge branch 'master' of https://github.com/silverwolfx10/TrampolinBank

Conflicts:
	WebContent/WEB-INF/faces-config.xml
	WebContent/comprovantes.xhtml
	WebContent/extrato.xhtml
	WebContent/inicio.xhtml
	WebContent/lstHistorico.xhtml
	WebContent/transferencia.xhtml
	build/classes/br/com/trampolinbank/bean/Movimentacao.class
	build/classes/br/com/trampolinbrank/dao/ContaDAO.class
	build/classes/br/com/trampolinbrank/dao/MovimentacaoDAO.class
	src/br/com/trampolinbank/bean/Movimentacao.java
	src/br/com/trampolinbank/manegedbean/ContaManegedBean.java
	src/br/com/trampolinbank/manegedbean/PagamentoManagerBean.java
	src/br/com/trampolinbank/manegedbean/TransferenciaManegedBean.java
	src/br/com/trampolinbrank/dao/ContaDAO.java
	src/br/com/trampolinbrank/dao/MovimentacaoDAO.java