Sprint 3 - US 63 - Criar ClienteDao
Sprint 3 - US 63 - Atualizar ContestacaoService
Merge pull request #22 from fabioajm/master

controller hive e inicio de interface
Sprint 3 - US 63 - Atualizacao das Paginas 1 e 2
Sprint 3 - US 63 - Criar Paginas 3 e 4
Merge branch 'master' of https://github.com/projetobdic3/bdic3.git

Conflicts:
	bdic3/bdic3-webapp/src/main/resources/messages.properties
	bdic3/bdic3-webapp/src/main/webapp/WEB-INF/jsp/layout/fragments/navbar.jsp
	bdic3/bdic3-webapp/src/main/webapp/WEB-INF/spring-servlet.xml
Sprint 3 - US 63 - 4 Telas da Contestacao em Funcionamento
US 60
US 61
Merge branch 'master' of https://github.com/projetobdic3/bdic3

Conflicts:
	bdic3/bdic3-webapp/src/main/java/br/com/ita/bdic3/entity/Transacao.java
	bdic3/bdic3-webapp/src/main/webapp/WEB-INF/jsp/layout/fragments/navbar.jsp
	bdic3/bdic3-webapp/src/main/webapp/WEB-INF/spring-servlet.xml
Merge remote branch 'upstream/master' into HEAD
controller, dao e interface hive
merge