Resolvendo conflitos.
Resolvendo conflitos, tentativa 2.
Merge branch 'master' of https://github.com/vbwarley/ProjetoSB

Conflicts:
	ProjetoSB/src/nucleo/model/persistencia/jdbc/JDBCDAOUsuario.java