cargas
Merge branch 'master' of https://github.com/zerotb/spaceapps_araucateam

Conflicts:
	ALMA_PROJECT/www/js/cargas.js
agregado HW a antenas
index
geo
gui
Merge branch 'master' of https://github.com/zerotb/spaceapps_araucateam

Conflicts:
	ALMA_PROJECT/www/index.html
	ALMA_PROJECT/www/js/cargas.js
	ALMA_PROJECT/www/js/geo.js
Merge branch 'master' of https://github.com/zerotb/spaceapps_araucateam
Merge branch 'master' of https://github.com/zerotb/spaceapps_araucateam