persistencia
Merge branch 'master' of https://github.com/nandogodoy/arqsoft

Conflicts:
	RecetaAlToquePersistencia-ejb/src/conf/persistence.xml