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