DAO, Conexão e Persistencia
Corringindo MERGE
DAO Generico
Merge branch 'master' of https://github.com/leonardom/hambriento

Conflicts:
	target/hambriento-1.0-SNAPSHOT.war
	target/maven-archiver/pom.properties

	deleted:    target/classes/.netbeans_automatic_build
	modified:   target/maven-archiver/pom.properties