Nuevo DAO Venta
Merge origin/master

Conflicts:
	src/farmaciabrahim/FarmaciaBrahim.java
	src/farmaciabrahim/Registro.java