Hotel - Falta update
Merge remote-tracking branch 'origin/master'

Conflicts:
	script_creacion_inicial.sql

	modified:   script_creacion_inicial.sql