cambio en menu actividades
Merge branch 'master' of https://github.com/hyoume/aesir

Conflicts:
	co2cloud/default/View/Indicators/index.ctp