Before huge merge
Merge branch 'master' of github.com:ChileanVirtualObservatory/FONDEFD11I1060