Funciones Historial reloaded
Merge remote-tracking branch 'origin/master'

Conflicts:
	data/script_creacion_inicial.sql