Funcionando lo basico
Tratando de configurar spring con hibernate
Merge branch 'master' of https://github.com/javierlibrandi/JSF.git

Conflicts:
	.classpath
	.project
	pom.xml