pres i post de domini
Merge remote-tracking branch 'origin/master'

Conflicts:
	Controlador_Domini/Controlador_Domini_Doctor.java