Actualizacion
Merge branch 'master' of
https://github.com/yedinzon/AnimalCareRemington.git

Conflicts:
	AnimalCare/WebContent/pages/entidades/registroEntidad.xhtml