Cambio a modelos de ComboBox en Mascota
Merge remote-tracking branch 'origin/master'

Conflicts:
	PrototiposDL/src/dogslovers/control/Principal.java