cambio
Participantes
Merge branch 'master' of https://github.com/ChileanVirtualObservatory/ASYDO

Conflicts:
	src/SynUniverse.py
	src/splataget.py
	src/test.py