comit
Merge branch 'BBDDNueva' of https://github.com/cabrerabywaters/remel-repo into BBDDNueva

Conflicts:
	Capa_Vistas/Medico/AtencionPaciente/moduloReceta.php
	ajax/autocompleteMedicamento.php