subiendo
doing merge
Merge branch 'master' of https://github.com/rbalda/PetMedProject

Conflicts:
	PetMed/src/com/petmed/controller/Cita.java
	PetMed/src/com/petmed/controller/Cliente.java
	PetMed/src/com/petmed/controller/Consulta.java
	PetMed/src/com/petmed/controller/Diagnostico.java
	PetMed/src/com/petmed/controller/Farmaco.java
	PetMed/src/com/petmed/controller/Fisiologia.java
	PetMed/src/com/petmed/controller/Mascota.java
	PetMed/src/com/petmed/controller/Perfil.java
	PetMed/src/com/petmed/controller/Persona.java
	PetMed/src/com/petmed/controller/Sintoma.java
	PetMed/src/com/petmed/controller/Tratamiento.java
	PetMed/src/com/petmed/controller/Usuario.java
	PetMed/src/com/petmed/controller/Vacuna.java
	PetMed/src/com/petmed/models/BaseDAO.java
	PetMed/src/com/petmed/models/ClienteDAO.java
	PetMed/src/com/petmed/view/Panel_inferior.java