Adicionando dependencias
Merge branch 'master' of github.com:lucasgrecco/javacontas

Conflicts:
	src/META-INF/persistence.xml