Done
Merge branch 'master' of github.com:ChileanVirtualObservatory/FONDEFD11I1060

Conflicts:
	ObservatorioVirtual/Hito4/publish/plain_main.pdf