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

Conflicts:
	ALMA_PROJECT/www/data/operational.xml
Android Build
Merge branch 'master' of https://github.com/zerotb/spaceapps_araucateam